1. 27 Jun, 2006 2 commits
    • unknown's avatar
      BUG#20725 MySQLD cluster use "fast count" is broken · da81451d
      unknown authored
      fix based on review by tomas.
      
      conform to bug we haven't fixed yet.
      
      
      sql/ha_ndbcluster.cc:
        return -1 on error in ::records().
        
        produces a compiler warning, a bug and is evil.
        
        however, until we go and really fix the bug properly, it's best to conform
      da81451d
    • unknown's avatar
      BUG#20725 MySQLD cluster use "fast count" is broken · 95126295
      unknown authored
      Post recent handler changes, fast count(*) for cluster was broken.
      
      Seeing as we maintain an exact count for ndb, we can easily use this for an optimisation.
      
      With this patch, and use_exact_count DISABLED, we will use the fast way
      of getting count(*) but not use the exact count for the optimiser.
      
      With this patch and use_exact_count ENABLED, we will use the fast way of
      getting count(*) and use the exact count for the optimiser.
      
      
      sql/ha_ndbcluster.cc:
        Implement handler::records() and set appropriate handler flag.
      sql/ha_ndbcluster.h:
        we implment handler::records() for fast count(*)
      95126295
  2. 25 Jun, 2006 3 commits
    • unknown's avatar
      Post merge fix · 725ab9df
      unknown authored
      
      mysql-test/r/func_time.result:
        post-merge fix
      mysql-test/r/select.result:
        post-merge fix
      725ab9df
    • unknown's avatar
      Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge · c2575322
      unknown authored
      into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.1
      
      
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/valgrind.supp:
        Auto merged
      mysql-test/r/func_str.result:
        Auto merged
      mysql-test/r/insert_select.result:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      mysys/Makefile.am:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/opt_sum.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      storage/ndb/src/ndbapi/ndberror.c:
        Auto merged
      include/Makefile.am:
        manual merge
      mysql-test/r/func_time.result:
        manual merge
      mysql-test/r/select.result:
        manual merge
      c2575322
    • unknown's avatar
      .del-make_win_src_distribution.sh~f80d8fca44e4e5f1: · d98a7999
      unknown authored
        Delete: scripts/make_win_src_distribution.sh
      Makefile.am:
        Unix and Windows now shares source package
      
      
      scripts/Makefile.am:
        Unix and Windows now shares source package
      BitKeeper/deleted/.del-make_win_src_distribution.sh~f80d8fca44e4e5f1:
        Delete: scripts/make_win_src_distribution.sh
      d98a7999
  3. 24 Jun, 2006 4 commits
  4. 23 Jun, 2006 13 commits
  5. 22 Jun, 2006 12 commits
    • unknown's avatar
      Remove compiler warnings · e03f8ef2
      unknown authored
      Fixed wrong table flags type in ndbcluster that caused previous commit to fail
      
      
      client/mysqltest.c:
        Portability fix
      mysys/my_bitmap.c:
        Remove compiler warning
      mysys/my_handler.c:
        Remove compiler warning
      mysys/thr_lock.c:
        Remove compiler warning
      plugin/fulltext/plugin_example.c:
        Remove compiler warning
      sql/ha_ndbcluster.h:
        Fixed wrong of handler flags (caused previous commit to fail)
      sql/ha_ndbcluster_binlog.cc:
        Remove compiler warning
      sql/handler.cc:
        Indentation cleanups
      sql/mysql_priv.h:
        Changed log_output_options to ulong to remove compiler warning (and wrong test on 64 bit machines)
      sql/mysqld.cc:
        Changed log_output_options to ulong to remove compiler warning (and wrong test on 64 bit machines)
        Split initialization of variables of different types to remove compiler warning
      sql/set_var.cc:
        Fixed indentation
      sql/set_var.h:
        sys_var_log_output now takes a pointer to ulong
      storage/archive/archive_test.c:
        Remove compiler warning
      e03f8ef2
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 460b8241
      unknown authored
      into  mysql.com:/home/my/mysql-5.1
      
      
      sql/handler.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      460b8241
    • unknown's avatar
      Merge monty@192.168.0.9:/my/mysql-5.1 · b38b9cae
      unknown authored
      into  mysql.com:/home/my/mysql-5.1
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      b38b9cae
    • unknown's avatar
      Fixed failure with rpl_truncate_7ndb.test when using statement based replication. · b58e990c
      unknown authored
      is_injective -> table_flag() HA_HAS_OWN_BINLOGGING
      (Faster and easier to understand)
      Allow cluster_binlogging also in mixed replication mode.
      
      
      mysql-test/t/rpl_truncate_7ndb.test:
        Ensure that test is only run with mixed or row based replication
      sql/ha_ndbcluster.cc:
        Enforce row based replication if a cluster table is used
      sql/ha_ndbcluster.h:
        Remove is_injective() (Is now a table flag)
      sql/ha_ndbcluster_binlog.cc:
        Use cluster binlogging also in mixed binary logging
        (Using a cluster table will enforce row based replication in mixed mode, so this should be ok)
      sql/handler.cc:
        is_injective -> HA_HAS_OWN_BINLOGGING
      sql/handler.h:
        is_injective -> HA_HAS_OWN_BINLOGGING
      mysql-test/include/have_binlog_format_mixed_or_row.inc:
        New BitKeeper file ``mysql-test/include/have_binlog_format_mixed_or_row.inc''
      mysql-test/r/rpl_truncate_7ndb_2.result:
        New BitKeeper file ``mysql-test/r/rpl_truncate_7ndb_2.result''
      mysql-test/t/rpl_truncate_7ndb_2-master.opt:
        New BitKeeper file ``mysql-test/t/rpl_truncate_7ndb_2-master.opt''
      mysql-test/t/rpl_truncate_7ndb_2.test:
        New BitKeeper file ``mysql-test/t/rpl_truncate_7ndb_2.test''
      b58e990c
    • unknown's avatar
      Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my51 · c04d04ec
      unknown authored
      into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug14935
      
      
      c04d04ec
    • unknown's avatar
      Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my51 · f6a65b02
      unknown authored
      into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug18781
      
      
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      storage/ndb/src/ndbapi/ndberror.c:
        Auto merged
      f6a65b02
    • unknown's avatar
      ndb - bug#18781 post-merge 5.0->5.1 fixes (one more to come) · 5aaba829
      unknown authored
            have to push this to be able to push 5.0
      
      
      storage/ndb/include/kernel/signaldata/DictLock.hpp:
        Rename: ndb/include/kernel/signaldata/DictLock.hpp -> storage/ndb/include/kernel/signaldata/DictLock.hpp
      storage/ndb/src/kernel/blocks/dbdict/DictLock.txt:
        Rename: ndb/src/kernel/blocks/dbdict/DictLock.txt -> storage/ndb/src/kernel/blocks/dbdict/DictLock.txt
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
        debug
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        bug#18781 post-merge 5.0->5.1 fixes (one more to come)
      storage/ndb/src/ndbapi/ndberror.c:
        bug#18781 post-merge 5.0->5.1 fixes (one more to come)
      storage/ndb/test/ndbapi/testDict.cpp:
        bug#18781 post-merge 5.0->5.1 fixes (one more to come)
      storage/ndb/test/src/NdbRestarter.cpp:
        bug#18781 post-merge 5.0->5.1 fixes (one more to come)
      5aaba829
    • unknown's avatar
      Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1 · d9ec7f3c
      unknown authored
      into  mysql.com:/home/bk/fix-mysql-5.1
      
      
      sql/sql_insert.cc:
        Auto merged
      d9ec7f3c
    • unknown's avatar
      Patch to handle some bad situations resulting from the fix for BUG#19995. · ab28aa9c
      unknown authored
      
      sql/handler.cc:
        Generating table maps from all locks that can be available: THD::extra_lock,
        THD::lock, and THD::locked_tables.
      sql/sql_class.h:
        Adding member Open_tables:state::extra_lock to hold the extra lock used by select_create.
        Removing select_insert::lock.
      sql/sql_insert.cc:
        Adding member Open_tables:state::extra_lock to hold the extra lock used by select_create.
        Removing select_insert::lock.
      ab28aa9c
    • unknown's avatar
      Merge mysql.com:/M50/bug19353-5.0 into mysql.com:/M51/bug19353-5.1 · 54b38dd6
      unknown authored
      
      storage/ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      support-files/mysql.server.sh:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      54b38dd6
    • unknown's avatar
      Merge monty@192.168.0.9:/my/mysql-5.1 · 79e3b534
      unknown authored
      into  mysql.com:/home/my/mysql-5.1
      
      
      mysql-test/extra/rpl_tests/rpl_log.test:
        Auto merged
      mysql-test/r/rpl_ndb_log.result:
        Auto merged
      mysql-test/r/rpl_row_log.result:
        Auto merged
      mysql-test/r/rpl_row_log_innodb.result:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      79e3b534
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 0f9ec6d6
      unknown authored
      into  mysql.com:/home/my/mysql-5.1
      
      
      mysql-test/extra/rpl_tests/rpl_log.test:
        Auto merged
      mysql-test/r/rpl_ndb_log.result:
        Auto merged
      mysql-test/r/rpl_row_log.result:
        Auto merged
      mysql-test/r/rpl_row_log_innodb.result:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/mysql_priv.h:
        SCCS merged
      0f9ec6d6
  6. 21 Jun, 2006 6 commits