diff options
author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-10-12 14:34:44 +0300 |
---|---|---|
committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-10-12 14:34:44 +0300 |
commit | 494b581f14abd7c073dae2da11d75c0ff697d967 (patch) | |
tree | 3a78110500a95c0e6c6410e6a7b730d882f168e5 /mysql-test/t/partition_innodb_plugin.test | |
parent | 8c2943ba437404973912b90cdf4c6d724f5f6ed3 (diff) | |
parent | 73db2a1504188611c3348e1bd55d181aea6ab533 (diff) | |
download | mariadb-git-494b581f14abd7c073dae2da11d75c0ff697d967.tar.gz |
auto-merge mysql-5.1->mysql-5.1-security
Diffstat (limited to 'mysql-test/t/partition_innodb_plugin.test')
-rw-r--r-- | mysql-test/t/partition_innodb_plugin.test | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/t/partition_innodb_plugin.test b/mysql-test/t/partition_innodb_plugin.test index e9e1471f4bd..60fe91ce920 100644 --- a/mysql-test/t/partition_innodb_plugin.test +++ b/mysql-test/t/partition_innodb_plugin.test @@ -33,7 +33,6 @@ call mtr.add_suppression("nnoDB: Error: table `test`.`t1` .* Partition.* InnoDB --echo # --echo # Bug#55091: Server crashes on ADD PARTITION after a failed attempt --echo # -SET @old_innodb_file_format_check = @@global.innodb_file_format_check; SET @old_innodb_file_format = @@global.innodb_file_format; SET @old_innodb_file_per_table = @@global.innodb_file_per_table; SET @old_innodb_strict_mode = @@global.innodb_strict_mode; @@ -92,7 +91,6 @@ DROP TABLE t1; SET @@global.innodb_strict_mode = @old_innodb_strict_mode; SET @@global.innodb_file_format = @old_innodb_file_format; SET @@global.innodb_file_per_table = @old_innodb_file_per_table; -SET @@global.innodb_file_format_check = @old_innodb_file_format_check; # # Bug#32430 - show engine innodb status causes errors |