← Back to branch summary

~tsarev/percona-server/5.1_slow_extended_tests_fixes

« back to all changes in this revision

Viewing changes to mysql-test.diff

  • Committer: kinoyasu
  • Date: 2010-05-20 10:47:38 UTC
  • mto: This revision was merged to the branch mainline in revision 7.
  • Revision ID: kinoyasu@gauntlet3-20100520104738-a7n33fbaf8cz7bmq
reorder and adjust mysql-test acript and add simple check for innodb_doublewrite_path option

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysql-test.diff
702
702
@@ -1 +1 @@
703
703
-innodb-index: InnoDB: Error: table `test`.`t1#1` already exists in InnoDB internal
704
704
+#innodb-index: InnoDB: Error: table `test`.`t1#1` already exists in InnoDB internal
 
705
diff -ruN a/mysql-test/t/innodb-autoinc-44030.test b/mysql-test/t/innodb-autoinc-44030.test
 
706
--- a/mysql-test/t/innodb-autoinc-44030.test    2010-04-06 23:36:14.000000000 +0900
 
707
+++ b/mysql-test/t/innodb-autoinc-44030.test    2010-05-20 18:50:47.000000000 +0900
 
708
@@ -2,6 +2,8 @@
 
709
 # embedded server ignores 'delayed', so skip this
 
710
 -- source include/not_embedded.inc
 
711
 
 
712
+let $innodb_file_format_check_orig=`select @@innodb_file_format_check`;
 
713
+
 
714
 --disable_warnings
 
715
 drop table if exists t1;
 
716
 --enable_warnings
 
717
@@ -32,3 +34,6 @@
 
718
 INSERT INTO t1 VALUES(null);
 
719
 SELECT * FROM t1;
 
720
 DROP TABLE t1;
 
721
+
 
722
+-- disable_query_log
 
723
+eval SET GLOBAL innodb_file_format_check=$innodb_file_format_check_orig;
 
724
diff -ruN a/mysql-test/t/innodb-autoinc.test b/mysql-test/t/innodb-autoinc.test
 
725
--- a/mysql-test/t/innodb-autoinc.test  2010-04-06 23:36:14.000000000 +0900
 
726
+++ b/mysql-test/t/innodb-autoinc.test  2010-05-20 18:50:06.000000000 +0900
 
727
@@ -6,6 +6,8 @@
 
728
 drop table if exists t1;
 
729
 --enable_warnings
 
730
 
 
731
+let $innodb_file_format_check_orig=`select @@innodb_file_format_check`;
 
732
+
 
733
 #
 
734
 # Bug #34335
 
735
 #
 
736
@@ -662,3 +664,6 @@
 
737
 SELECT * FROM t1;
 
738
 SHOW CREATE TABLE t1;
 
739
 DROP TABLE t1;
 
740
+
 
741
+-- disable_query_log
 
742
+eval SET GLOBAL innodb_file_format_check=$innodb_file_format_check_orig;
705
743
diff -ruN a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test
706
744
--- a/mysql-test/t/innodb.test  2010-04-06 23:36:15.000000000 +0900
707
745
+++ b/mysql-test/t/innodb.test  2010-04-30 17:53:06.000000000 +0900