List:Commits« Previous MessageNext Message »
From:Georgi Kodinov Date:February 18 2010 8:51am
Subject:bzr commit into mysql-5.1-bugteam branch (joro:3346) Bug#51049
View as plain text  
#At file:///home/kgeorge/mysql/work/fix-5.1-bugteam/ based on revid:sergey.glukhov@stripped

 3346 Georgi Kodinov	2010-02-18
      Bug #51049: main.bug39022 fails in mysql-trunk-merge
      
      Fixed the test to behave correctly with ps-protocol
      and binlog format row.

    added:
      mysql-test/include/not_binlog_format_row.inc
    modified:
      mysql-test/r/bug39022.result
      mysql-test/t/bug39022.test
=== added file 'mysql-test/include/not_binlog_format_row.inc'
--- a/mysql-test/include/not_binlog_format_row.inc	1970-01-01 00:00:00 +0000
+++ b/mysql-test/include/not_binlog_format_row.inc	2010-02-18 08:48:15 +0000
@@ -0,0 +1,4 @@
+if (`SELECT @@binlog_format = 'ROW'`)
+{
+     skip Test cannot run with binlog_format row;
+}

=== modified file 'mysql-test/r/bug39022.result'
--- a/mysql-test/r/bug39022.result	2009-12-23 10:45:18 +0000
+++ b/mysql-test/r/bug39022.result	2010-02-18 08:48:15 +0000
@@ -28,5 +28,5 @@ SELECT d FROM t2,t1 WHERE d=(SELECT MAX(
 ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
 # in thread2
 d
-# in default
+# in thread1;
 DROP TABLE t1,t2;

=== modified file 'mysql-test/t/bug39022.test'
--- a/mysql-test/t/bug39022.test	2009-12-23 10:45:18 +0000
+++ b/mysql-test/t/bug39022.test	2010-02-18 08:48:15 +0000
@@ -1,5 +1,6 @@
 -- source include/have_log_bin.inc
 -- source include/have_innodb.inc
+-- source include/not_binlog_format_row.inc
 
 --echo #
 --echo # Bug #39022: Mysql randomly crashing in lock_sec_rec_cons_read_sees
@@ -49,10 +50,14 @@ connection thread2;
 --echo # in thread2
 REAP;
 
-connection default;
---echo # in default
+disconnect thread2;
+--source include/wait_until_disconnected.inc
 
+connection thread1;
+--echo # in thread1;
 disconnect thread1;
-disconnect thread2;
+--source include/wait_until_disconnected.inc
+
+connection default;
 
 DROP TABLE t1,t2;


Attachment: [text/bzr-bundle] bzr/joro@sun.com-20100218084815-53nb9oonzd7r4gmj.bundle
Thread
bzr commit into mysql-5.1-bugteam branch (joro:3346) Bug#51049Georgi Kodinov18 Feb