- 19 Apr, 2008 4 commits
- 14 Apr, 2008 3 commits
-
-
unknown authored
into kpdesk.mysql.com:/home/thek/Development/cpp/mysql-5.1-merge mysql-test/r/grant.result: Auto merged mysql-test/t/grant.test: Auto merged sql/sql_acl.cc: Auto merged
-
unknown authored
into kpdesk.mysql.com:/home/thek/Development/cpp/mysql-5.0-merge sql/sql_acl.cc: Auto merged mysql-test/r/grant.result: manual merge mysql-test/t/grant.test: manual merge
-
unknown authored
into kpdesk.mysql.com:/home/thek/Development/cpp/mysql-5.1-merge mysql-test/r/grant.result: Auto merged mysql-test/t/disabled.def: Auto merged mysql-test/t/grant.test: Auto merged sql/opt_range.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_parse.cc: Auto merged storage/myisam/mi_create.c: Auto merged
-
- 08 Apr, 2008 4 commits
- 07 Apr, 2008 6 commits
-
-
unknown authored
-
unknown authored
Enable back the disabled test case. mysql-test/t/disabled.def: Enable the test case innodb_mysql. sql/sql_parse.cc: Fix the random failure of innodb_mysql test. The failure is not random any more after a patch for Bug 12713 added asserts around handler commit.
-
unknown authored
into mockturtle.local:/home/dlenev/src/mysql-5.1-symlink
-
unknown authored
-
unknown authored
DBUG_RETURN was missing form an exit path in 5.1 branch of alloc_root mysys/my_alloc.c: Fixed missing DBUG_RETURN
-
unknown authored
The problem was that symlink.test failed due to debug assertions or due to errors emitted for wrong statements (in non-debug builds) if 6.0 version of server was run with --thread-handling=pool-of-threads option. The above problems were caused by that on the one hand code mi_create() which handles case when error is returned relies on my_errno being set to appropriate non-0 value, but on the other it has not done this in case when error was emitted due to discovery that share for table which we are going to create is already present in the list of open shares. Running server with pool-of-threads option just exposed this bug since in this scheduler mode my_errno is reset to 0 when connection (THD) is reattached to the "real" thread. This fix ensures that code in mi_create() properly sets my_errno in the case described above. Since original reason that caused this bug to be exposed in 6.0 tree might also under very special conditions lead to incorrect behavior of earlier versions of server (i.e. to errors emitted for wrong statements) this patch is also being pushed into 5.1 tree. No test case is present as this code is already covered by a test case + pushbuild options combination in 6.0. storage/myisam/mi_create.c: Code in mi_create() which handles case when error is returned relies on my_errno being set to appropriate non-0 value. Adjusted code which emits error when we discover that share for table which we are going to create is already present in the list of open shares to do this.
-
- 01 Apr, 2008 9 commits
-
-
unknown authored
sql/share/errmsg.txt: Reverting error message to before merge.
-
unknown authored
This is a code clean up. Removed redundant (and unused) TABLE_LIST variable intended as an IN- parameter for setup_order. sql/sql_update.cc: Removed redundant (and unused) TABLE_LIST variable intended as an IN- parameter for setup_order.
-
unknown authored
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge mysql-test/r/binlog_index.result: Manual merge
-
unknown authored
mysql-test/r/binlog_index.result: Result set change.
-
unknown authored
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge sql/share/errmsg.txt: Manual merge
-
unknown authored
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime sql/sql_acl.cc: Auto merged mysys/my_thr_init.c: Null merge.
-
unknown authored
into adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime sql/sql_acl.cc: Auto merged
-
unknown authored
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
-
unknown authored
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge sql/share/errmsg.txt: Manual merge.
-
- 31 Mar, 2008 14 commits
-
-
unknown authored
-
unknown authored
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge mysql-test/suite/rpl/r/rpl_packet.result: Auto merged mysql-test/suite/rpl/t/rpl_packet.test: Auto merged
-
unknown authored
mysql-test/r/rpl_packet.result: Result change. mysql-test/t/rpl_packet.test: Setting net_buffer_length correctly for the test instead of relying on it being set correctly. Waiting for slave to stop after issuing a SLAVE STOP and waiting for slave to start when issuing a SLAVE START to prevent race conditions causing test failure.
-
unknown authored
into mysql.com:/Users/davi/mysql/mysql-5.1-runtime sql/sql_prepare.cc: Auto merged
-
unknown authored
-
unknown authored
sql/sql_base.cc: Remove table definition stage 3 code, stage 3 will be done differently in scope of WL#3726
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam
-
unknown authored
into mats-laptop.(none):/home/bk/b29020-mysql-5.1-rpl
-
unknown authored
tables is not zero any more. For row-based logging, there is an extra commit for sending rows changed by the statement to the binary log. mysql-test/include/commit.inc: For row-based logging, an extra commit is done for each statement to commit non-transactional changes to the binary log. mysql-test/r/commit_1innodb.result: Result change.
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam sql/log.cc: Auto merged sql/slave.cc: Auto merged sql/share/errmsg.txt: merged 5.1-main to 5.1-bugteam
-
unknown authored
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
-
unknown authored
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam storage/innobase/handler/ha_innodb.cc: Auto merged
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam include/my_dbug.h: Auto merged mysys/mf_keycache.c: Auto merged sql/item_func.cc: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_select.cc: Auto merged storage/myisam/mi_check.c: Auto merged storage/myisam/mi_dynrec.c: Auto merged storage/myisam/mi_open.c: Auto merged storage/myisam/mi_packrec.c: Auto merged storage/myisam/mi_test1.c: Auto merged storage/myisam/mi_test2.c: Auto merged storage/myisam/mi_write.c: Auto merged storage/myisammrg/ha_myisammrg.cc: Auto merged
-