- 21 Jun, 2007 6 commits
-
-
unknown authored
-
unknown authored
into mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl sql/sql_acl.cc: Auto merged
-
unknown authored
-
unknown authored
mysql-test/extra/rpl_tests/rpl_deadlock.test: Restoring old test code, but masking out offending columns mysql-test/r/rpl_deadlock_innodb.result: Result change
-
unknown authored
into kindahl-laptop.dnsalias.net:/home/bk/fix-mysql-5.1-rpl
-
unknown authored
mysql-test/extra/rpl_tests/rpl_deadlock.test: Using include/show_slave_status.inc to get correct masking of columns. mysql-test/r/rpl_deadlock_innodb.result: result change
-
- 20 Jun, 2007 11 commits
-
-
unknown authored
into kindahl-laptop.dnsalias.net:/home/bk/b29030-mysql-5.0-rpl
-
unknown authored
into mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
-
unknown authored
and replicated): A DROP USER statement with a non-existing user was correctly written to the binary log (there might be users that were removed, but not all), but the error code was not set, which caused the slave to stop with an error. The error reporting code was moved to before the statement was logged to ensure that the error information for the thread was correctly set up. This works since my_error() will set the fields net.last_errno and net.last_error for the thread that is reporting the error, and this will then be picked up when the Query_log_event is created and written to the binary log. sql/sql_acl.cc: Moving error reporting code to ensure that thd->net.last_err{or,no} is set and adding debug printout. mysql-test/r/rpl_grant.result: New BitKeeper file ``mysql-test/r/rpl_grant.result'' mysql-test/t/rpl_grant.test: New BitKeeper file ``mysql-test/t/rpl_grant.test''
-
unknown authored
into kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
-
unknown authored
into dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug27583-merge sql/log_event.cc: manual merge, use local as the patch is in 5.1
-
unknown authored
forgotten merge with 5.0. There can be some bugs waiting for this fix in 5.0 like Bug@29232 sql/log_event.cc: file name is changed in step with the position.
-
unknown authored
into kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
-
unknown authored
causes later tests to fail. mysql-test/r/ndb_backup_print.result: Result change. mysql-test/t/ndb_backup_print.test: Adding missing drop table at the end of the test.
-
unknown authored
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl sql/ha_ndbcluster_cond.h: Auto merged
-
unknown authored
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
-
unknown authored
-
- 19 Jun, 2007 17 commits
-
-
unknown authored
mysql-test/r/binlog_multi_engine.result: Result change mysql-test/t/binlog_multi_engine.test: Fixing test case. Keeping some bad statements in the test since I don't want to disable the entire test. Have marked the offending statement so that they can easily be found.
-
unknown authored
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb sql/ha_ndbcluster_cond.h: Auto merged
-
unknown authored
-
unknown authored
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb sql/ha_ndbcluster_cond.h: Auto merged
-
unknown authored
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1 configure.in: Auto merged
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1 configure.in: Auto merged
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 configure.in: Auto merged
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
-
unknown authored
configure.in: Raise version number after cloning 5.0.44
-
unknown authored
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
-
unknown authored
-
unknown authored
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
-
unknown authored
- get the ndb flags right, so that the behaviour is as before
-
unknown authored
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
-
unknown authored
-
unknown authored
mysql-test/r/binlog_unsafe.result: Result change mysql-test/r/rpl_loaddata_fatal.result: Result change mysql-test/r/rpl_udf.result: Result change mysql-test/t/binlog_innodb.test: Test requires binary log mysql-test/t/binlog_unsafe.test: Test requires binary log mysql-test/t/multi_update.test: Test requires binary log. Error changed for a statement. mysql-test/t/rpl_row_basic_11bugs.test: Error changed for a statement.
-
- 18 Jun, 2007 6 commits
-
-
unknown authored
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl mysql-test/extra/rpl_tests/rpl_log.test: Auto merged mysql-test/extra/rpl_tests/rpl_row_basic.test: Auto merged mysql-test/t/rpl_ndb_bank.test: Auto merged mysql-test/t/rpl_ndb_basic.test: Auto merged mysql-test/t/rpl_ndb_do_table.test: Auto merged mysql-test/t/rpl_ndb_idempotent.test: Auto merged mysql-test/t/rpl_ndb_stm_innodb.test: Auto merged mysql-test/t/rpl_ndb_sync.test: Auto merged sql/ha_ndbcluster_binlog.cc: Auto merged storage/ndb/test/run-test/daily-basic-tests.txt: Auto merged mysql-test/include/have_multi_ndb.inc: manual merge mysql-test/include/have_ndb.inc: manual merge mysql-test/t/rpl_ndb_commit_afterflush.test: manual merge mysql-test/t/rpl_ndb_ddl.test: manual merge mysql-test/t/rpl_ndb_innodb_trans.test: manual merge
-
unknown authored
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb storage/ndb/src/kernel/blocks/pgman.cpp: Auto merged
-
unknown authored
-
unknown authored
storage/ndb/src/kernel/blocks/pgman.cpp: missing stack pruning in drop_page
-
unknown authored
-
unknown authored
- also remove printout for error 4009
-