diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2011-10-05 22:38:00 +0200 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2011-10-05 22:38:00 +0200 |
| commit | ebaa6006645b5ce94be18f8dccae776803884be5 (patch) | |
| tree | 0db719b0715b55d11f02f15e8b04ba8182f74ec2 /mysql-test/r | |
| parent | cff85ac1cd420e11d8d274f99db6ab01b8dfadaa (diff) | |
| parent | 9c68ca6394c552fc7a292e48db6a647ae4242ea0 (diff) | |
| download | mariadb-git-ebaa6006645b5ce94be18f8dccae776803884be5.tar.gz | |
merge 5.1-mtr => 5.1
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/partition_innodb_plugin.result | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/r/partition_innodb_plugin.result b/mysql-test/r/partition_innodb_plugin.result index f6b5ce84338..43838170501 100644 --- a/mysql-test/r/partition_innodb_plugin.result +++ b/mysql-test/r/partition_innodb_plugin.result @@ -2,7 +2,6 @@ call mtr.add_suppression("nnoDB: Error: table `test`.`t1` .* Partition.* InnoDB # # Bug#55091: Server crashes on ADD PARTITION after a failed attempt # -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; @@ -70,7 +69,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; SET NAMES utf8; CREATE TABLE `t``\""e` (a INT, PRIMARY KEY (a)) ENGINE=InnoDB |