- 27 Jun, 2006 2 commits
-
-
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
-
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(*)
-
- 25 Jun, 2006 3 commits
-
-
unknown authored
mysql-test/r/func_time.result: post-merge fix mysql-test/r/select.result: post-merge fix
-
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
-
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
-
- 24 Jun, 2006 4 commits
-
-
unknown authored
into mysql.com:/usr/local/mysql/tmp-5.1 mysql-test/t/wait_timeout.test: Auto merged
-
unknown authored
into mysql.com:/usr/local/mysql/tmp-5.1
-
unknown authored
Sometimes the helper connection (that is watching for the main connection to time out) would itself time out first, causing the test to fail. mysql-test/t/wait_timeout.test: Increase connection timeout in connection wait_con so we will not loose the connection that is watching for the real wait_timeout to trigger.
-
unknown authored
include/mysql/plugin.h: Fix compilation on non-GCC compilers. sql/CMakeLists.txt: Add missing file.
-
- 23 Jun, 2006 13 commits
-
-
unknown authored
into mysql.com:/data0/knielsen/tmp-5.1
-
unknown authored
-
unknown authored
into mysql.com:/home/emurphy/src/bk-clean/mysql-5.1 mysql-test/r/func_time.result: Auto merged sql/item_cmpfunc.cc: Auto merged mysql-test/r/lock_multi.result: manual merge mysql-test/t/lock_multi.test: manual merge sql/ha_innodb.cc: manual merge
-
unknown authored
into mysql.com:/usr/local/mysql/tmp-5.1 server-tools/instance-manager/instance_options.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/mysqld.cc: Auto merged sql/rpl_injector.cc: Auto merged sql/rpl_injector.h: Auto merged
-
unknown authored
into mysql.com:/usr/local/mysql/mysql-5.1-vg-apr2 mysys/mf_dirname.c: Auto merged server-tools/instance-manager/instance_options.cc: Manual merge.
-
unknown authored
The problem was a call to convert_dirname() with a destination buffer that did not have room for the trailing slash added by that function. This could cause the instance manager to crash in some cases. mysys/mf_dirname.c: Clarify in comments that convert_dirname destination must be larger than source to accomodate a trailing slash. server-tools/instance-manager/instance_options.cc: Fix buffer overrun.
-
unknown authored
into mysql.com:/home/my/mysql-5.1 sql/handler.cc: Auto merged sql/log_event.cc: Auto merged
-
unknown authored
(Happens if main thread exists before kill_server thread, which is ok)
-
unknown authored
sql/handler.cc: Made code more portable
-
unknown authored
into mysql.com:/home/my/mysql-5.1 sql/handler.cc: Auto merged sql/sql_class.h: Auto merged
-
unknown authored
This change allows us to use the stmt_binlog function in the code without ifdefs (We should avoid having ifdefs in the .cc and .c files) sql/handler.h: Removed compiler warnings
-
unknown authored
into mysql.com:/home/my/mysql-5.1 sql/handler.cc: Auto merged
-
unknown authored
into mysql.com:/home/my/mysql-5.1 sql/handler.cc: Auto merged sql/sql_class.h: Auto merged
-
- 22 Jun, 2006 12 commits
-
-
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
-
unknown authored
into mysql.com:/home/my/mysql-5.1 sql/handler.cc: Auto merged sql/sql_class.h: Auto merged
-
unknown authored
into mysql.com:/home/my/mysql-5.1 sql/ha_ndbcluster.cc: Auto merged
-
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''
-
unknown authored
into clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug14935
-
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
-
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)
-
unknown authored
into mysql.com:/home/bk/fix-mysql-5.1 sql/sql_insert.cc: Auto merged
-
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.
-
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
-
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
-
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
-
- 21 Jun, 2006 6 commits
-
-
unknown authored
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt mysql-test/r/partition_error.result: Auto merged sql/mysql_priv.h: Auto merged mysql-test/r/partition.result: Auto merged
-
unknown authored
into dator5.(none):/home/pappa/bug19281 sql/sql_insert.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_table.cc: Auto merged
-
unknown authored
-
unknown authored
into a193-229-222-105.elisa-laajakaista.fi:/home/jani/mysql-5.0
-
unknown authored
into mysql.com:/home/bk/fix-mysql-5.0
-
unknown authored
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt mysql-test/r/show_check.result: Auto merged sql/log.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/sql_delete.cc: Auto merged
-