List:Commits« Previous MessageNext Message »
From:Sunny Bains Date:April 30 2010 9:54pm
Subject:bzr push into mysql-trunk-innodb branch (Sunny.Bains:3046 to 3047)
View as plain text  
 3047 Sunny Bains	2010-05-01
      Fix failing tests.

    modified:
      mysql-test/suite/innodb/t/innodb-autoinc-44030.test
      mysql-test/suite/innodb/t/innodb-autoinc.test
 3046 Sunny Bains	2010-04-30
      Add missing semi-colon.

    modified:
      storage/innobase/srv/srv0srv.c
=== modified file 'mysql-test/suite/innodb/t/innodb-autoinc-44030.test'
--- a/mysql-test/suite/innodb/t/innodb-autoinc-44030.test	revid:sunny.bains@stripped
+++ b/mysql-test/suite/innodb/t/innodb-autoinc-44030.test	revid:sunny.bains@stripped
@@ -2,6 +2,8 @@
 # embedded server ignores 'delayed', so skip this
 -- source include/not_embedded.inc
 
+let $innodb_file_format_check_orig=`select @@innodb_file_format_check`;
+
 --disable_warnings
 drop table if exists t1;
 --enable_warnings
@@ -32,3 +34,10 @@ SHOW CREATE TABLE t1;
 INSERT INTO t1 VALUES(null);
 SELECT * FROM t1;
 DROP TABLE t1;
+
+#
+# restore environment to the state it was before this test execution
+#
+
+-- disable_query_log
+eval SET GLOBAL innodb_file_format_check=$innodb_file_format_check_orig;

=== modified file 'mysql-test/suite/innodb/t/innodb-autoinc.test'
--- a/mysql-test/suite/innodb/t/innodb-autoinc.test	revid:sunny.bains@stripped
+++ b/mysql-test/suite/innodb/t/innodb-autoinc.test	revid:sunny.bains@stripped
@@ -2,6 +2,8 @@
 # embedded server ignores 'delayed', so skip this
 -- source include/not_embedded.inc
 
+let $innodb_file_format_check_orig=`select @@innodb_file_format_check`;
+
 --disable_warnings
 drop table if exists t1;
 --enable_warnings
@@ -662,3 +664,11 @@ INSERT INTO  t1 VALUES (1), (2), (-68511
 SELECT * FROM t1;
 SHOW CREATE TABLE t1;
 DROP TABLE t1;
+
+
+#
+# restore environment to the state it was before this test execution
+#
+
+-- disable_query_log
+eval SET GLOBAL innodb_file_format_check=$innodb_file_format_check_orig;


Attachment: [text/bzr-bundle] bzr/sunny.bains@oracle.com-20100430215414-uifyc22h6bcpzuin.bundle
Thread
bzr push into mysql-trunk-innodb branch (Sunny.Bains:3046 to 3047) Sunny Bains30 Apr