- 16 Nov, 2006 2 commits
-
-
unknown authored
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-lex-string BUILD/SETUP.sh: Auto merged mysql-test/r/create.result: Auto merged mysql-test/t/create.test: Auto merged sql/mysql_priv.h: Auto merged sql/sql_class.h: Auto merged sql/sql_db.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged tests/mysql_client_test.c: Auto merged sql/item_timefunc.cc: Manual merge. sql/mysqld.cc: Manual merge. sql/mysqld.cc.rej: manual merge
-
unknown authored
into romeo.(none):/home/bk/memcheck-mysql-5.1 sql/sql_class.cc: Auto merged
-
- 15 Nov, 2006 12 commits
-
-
unknown authored
Adding class to handle temporary allocate of memory during write of rows. Eliminating cut'n-paste error between THD::binlog_{write,update,delete}_row(). sql/sql_class.cc: Adding class to handle temporary allocate of memory during write of rows. Eliminating cut'n-paste error between THD::binlog_{write,update,delete}_row().
-
unknown authored
into mysql.com:/home/bk/MERGE/mysql-5.1-merge BitKeeper/deleted/.del-CMakeLists.txt~1: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~2f6eabb2f69cb33d: Auto merged BitKeeper/deleted/.del-make_win_bin_dist: Auto merged client/mysql.cc: Auto merged sql/log.cc: Auto merged configure.in: Manual merge, main clone 5.0->5.1
-
unknown authored
into mysql.com:/home/bk/MERGE/mysql-5.0-merge
-
unknown authored
-
unknown authored
into mysql.com:/home/bk/MERGE/mysql-5.1-merge
-
unknown authored
into mysql.com:/home/bk/MERGE/mysql-5.0-merge
-
unknown authored
into mysql.com:/home/bk/MERGE/mysql-5.1-merge
-
unknown authored
into mysql.com:/home/bk/MERGE/mysql-5.0-merge
-
unknown authored
into mysql.com:/home/bk/MERGE/mysql-4.1-merge
-
unknown authored
into dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl
-
unknown authored
into dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
-
unknown authored
mending windows test. mysql-test/r/rpl_packet.result: results changed mysql-test/t/rpl_packet.test: removing because of the connection with windows client can be lost instead of the error code back (source: manual).
-
- 14 Nov, 2006 12 commits
-
-
unknown authored
into kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
-
unknown authored
into kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
-
unknown authored
into kahlann.erinye.com:/home/df/mysql/build/51 scripts/make_binary_distribution.sh: Auto merged
-
unknown authored
into kahlann.erinye.com:/home/df/mysql/build/mtr-5.0 scripts/make_binary_distribution.sh: SCCS merged
-
unknown authored
-
unknown authored
into kahlann.erinye.com:/home/df/mysql/build/51 mysql-test/Makefile.am: Auto merged
-
unknown authored
into kahlann.erinye.com:/home/df/mysql/build/mtr-5.0 mysql-test/Makefile.am: Auto merged
-
unknown authored
mysql-test/Makefile.am: add include/*.test to dist-hook and install-data-local targets to include the three .test files in mysql-test/include with make dist
-
unknown authored
-
unknown authored
into trift2.:/MySQL/M50/mysql-5.0 CMakeLists.txt: Auto merged client/mysql.cc: Auto merged sql/log.cc: Auto merged configure.in: Late merge of 5.0.28, no change here.
-
unknown authored
into dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/merge_50_1 sql/log_event.cc: Auto merged sql/log_event.h: Auto merged
-
unknown authored
ver 5.0 and 5.1 refinement. adding to the MAX_SIZE_LOG_EVENT_STATUS estimation status vars and EXECUTE_LOAD_QUERY_EXTRA_HEADER_LEN sql/log_event.cc: assertion on size of status vars sql/log_event.h: MAX_SIZE_LOG_EVENT_STATUS as the max bytes of contribution of status vars into repl message; MAX_SIZE_LOG_EVENT_STATUS is getting more wrt to 4.1 version.
-
- 13 Nov, 2006 14 commits
-
-
unknown authored
this caused mysql_client_test to fail when running from binary dist mysql-test/mysql-test-run.pl: Modify search path for mysql_client_test to look in "bin" not to look for "bin"
-
unknown authored
into mysql.com:/home/bk/MERGE/mysql-5.1-merge BitKeeper/triggers/post-commit: Auto merged mysql-test/t/func_gconcat.test: Auto merged sql/item_sum.cc: Auto merged sql/log_event.h: Auto merged sql/sql_repl.cc: Auto merged sql/slave.cc: Manual merge
-
unknown authored
into mysql.com:/home/bk/MERGE/mysql-5.0-merge BitKeeper/triggers/post-commit: Auto merged mysql-test/t/func_gconcat.test: Auto merged sql/item_sum.cc: Auto merged sql/sql_repl.cc: Auto merged sql/log_event.h: Manual merge sql/slave.cc: Manual merge
-
unknown authored
into romeo.(none):/home/bk/b18581-mysql-5.1-new-rpl sql/ha_ndbcluster_binlog.cc: Auto merged
-
unknown authored
sql/ha_ndbcluster_binlog.cc: Removing extreneous setting of current_stmt_binlog_row_based. sql/rpl_injector.cc: Since current_stmt_binlog_row_based is reset as the end of a transaction it needs to be set at the beginning of a transaction.
-
unknown authored
Raise version number after cloning 5.1.13 configure.in: Raise version number after cloning 5.1.13
-
unknown authored
into mysql.com:/home/bk/MERGE/mysql-5.1-merge BitKeeper/etc/collapsed: auto-union sql/mysql_priv.h: Auto merged sql/slave.cc: Auto merged
-
unknown authored
into mysql.com:/home/bk/MERGE/mysql-5.1-merge BitKeeper/etc/collapsed: auto-union mysql-test/r/view.result: Auto merged mysql-test/t/view.test: Auto merged sql/Makefile.am: Auto merged sql/handler.cc: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/slave.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_view.cc: Auto merged
-
unknown authored
into mysql.com:/home/bk/MERGE/mysql-5.0-merge BitKeeper/etc/collapsed: auto-union sql/mysql_priv.h: Auto merged sql/slave.cc: Auto merged
-
unknown authored
into mysql.com:/home/bk/MERGE/mysql-4.1-merge
-
unknown authored
An amendment for parsing argument in case NDB is compiled and active. NDB switches from mixed to row-based and back per each query. The previous patch was not aware of such behaviour and made exceptional assingment to row-based when no command line arg --binlog-format provided. Removing #if HAVE_NDB_BINLOG block alltogether: ndb supports mixed and if server was build without NDB using binlog nothing to care. Test for this piece of code is rather specific. While there is active bug23110 ndb_alter_table and some other should fail if no explict --binlog-format is given: mysql-test-run ndb_alter_table sql/mysqld.cc: ndb accepts mixed binlog_format switching to row internally via calling thd->set_binlog_format_row_if_mixed at the beginning and careful the->reset_current_stmt_binlog_row_based(). There is bug#23110 to implement it all carefully for DDL.
-
unknown authored
support-files/mysql.spec.sh: 1) Ensure that the features of each server built are reported in the first test run it takes. 2) Add "--with-partition" to the change log (missing on previous push).
-
unknown authored
into dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/merge_50 sql/log_event.cc: Auto merged
-
unknown authored
support-files/mysql.spec.sh: Add the "partition" feature to the server configuration, whether debugging or not. (bug#23949)
-