From 5a0fa6bec355e7550a6181777de1e5e130d38a53 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 18 Oct 2007 15:08:27 -0700 Subject: Fix for bug#31704 Just had to put in the removal of the autocommit, and make sure the commit occurred at the propper time. client/mysqlslap.c: Fix for auto-connect on counter. Relabeled variable which was misnamed. mysql-test/r/mysqlslap.result: Updated result file --- mysql-test/r/mysqlslap.result | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'mysql-test') diff --git a/mysql-test/r/mysqlslap.result b/mysql-test/r/mysqlslap.result index dfe721d10d2..7f2d4396c68 100644 --- a/mysql-test/r/mysqlslap.result +++ b/mysql-test/r/mysqlslap.result @@ -177,13 +177,17 @@ INSERT INTO t1 VALUES (1, 'This is a test'); insert into t2 values ('test', 'test2'); SET AUTOCOMMIT=0; SHOW TABLES; +SET AUTOCOMMIT=0; select * from t1; +COMMIT; select * from t2; COMMIT; select * from t1; +COMMIT; select * from t2; COMMIT; select * from t1; +COMMIT; select * from t2; COMMIT; COMMIT; @@ -199,13 +203,17 @@ INSERT INTO t1 VALUES (1, 'This is a test'); insert into t2 values ('test', 'test2'); SET AUTOCOMMIT=0; SHOW TABLES; +SET AUTOCOMMIT=0; select * from t1; +COMMIT; select * from t2; COMMIT; select * from t1; +COMMIT; select * from t2; COMMIT; select * from t1; +COMMIT; select * from t2; COMMIT; COMMIT; -- cgit v1.2.1 From f367a3488d3e28d3f79e380d47fac0c25b72ac63 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 14 Dec 2007 10:47:01 +0100 Subject: BUG#31880 make test failure from public bk tree mysql-test/mysql-test-run.pl: BUG#31880 make test failure from public bk tree Instead of handling "MTR_BUILD_THREAD set" and "MTR_BUILD_THREAD not set" differently, use the same subroutine to set up the port numbers. The addition of a second master apparently broke the old static port numbers. --- mysql-test/mysql-test-run.pl | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'mysql-test') diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 42298d635e7..7d7f5752787 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -481,14 +481,9 @@ sub command_line_setup () { $opt_suite= "main"; # Special default suite my $opt_comment; - $opt_master_myport= 9306; - $opt_slave_myport= 9308; - $opt_ndbcluster_port= 9310; - $opt_ndbcluster_port_slave= 9311; - $im_port= 9312; - $im_mysqld1_port= 9313; - $im_mysqld2_port= 9314; - + # Magic number -69.4 results in traditional test ports starting from 9306. + set_mtr_build_thread_ports(-69.4); + # If so requested, we try to avail ourselves of a unique build thread number. if ( $ENV{'MTR_BUILD_THREAD'} ) { if ( lc($ENV{'MTR_BUILD_THREAD'}) eq 'auto' ) { @@ -1322,6 +1317,7 @@ sub set_mtr_build_thread_ports($) { } # Up to two masters, up to three slaves + # A magic value in command_line_setup depends on thse equations. $opt_master_myport= $mtr_build_thread * 10 + 10000; # and 1 $opt_slave_myport= $opt_master_myport + 2; # and 3 4 $opt_ndbcluster_port= $opt_master_myport + 5; -- cgit v1.2.1 From c26739edf71f7da76c22d893143e540ceaaaf5ba Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 14 Dec 2007 10:51:05 +0100 Subject: typo --- mysql-test/mysql-test-run.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mysql-test') diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 7d7f5752787..29c5648090c 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1317,7 +1317,7 @@ sub set_mtr_build_thread_ports($) { } # Up to two masters, up to three slaves - # A magic value in command_line_setup depends on thse equations. + # A magic value in command_line_setup depends on these equations. $opt_master_myport= $mtr_build_thread * 10 + 10000; # and 1 $opt_slave_myport= $opt_master_myport + 2; # and 3 4 $opt_ndbcluster_port= $opt_master_myport + 5; -- cgit v1.2.1