From 08413254b7ad952d9cd97c2faf1f6898ea73d387 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Tue, 17 Jan 2017 18:49:34 +0200 Subject: Remove references to innodb_file_format. innodb_file_format=Barracuda is the default in MariaDB 10.2. Do not set it, because the option will be removed in MariaDB 10.3. Also, do not set innodb_file_per_table=1 because it is the default. Note that MDEV-11828 should fix the test innodb.innodb-64k already in 10.1. --- mysql-test/r/partition_innodb_plugin.result | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'mysql-test/r/partition_innodb_plugin.result') diff --git a/mysql-test/r/partition_innodb_plugin.result b/mysql-test/r/partition_innodb_plugin.result index cd5dfade0ab..28f5a1303ea 100644 --- a/mysql-test/r/partition_innodb_plugin.result +++ b/mysql-test/r/partition_innodb_plugin.result @@ -37,14 +37,10 @@ call mtr.add_suppression("InnoDB: Error: table `test`.`t1` .* InnoDB internal"); # # Bug#55091: Server crashes on ADD PARTITION after a failed attempt # -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; -SET @@global.innodb_file_format = Barracuda, -@@global.innodb_file_per_table = ON, +SET @@global.innodb_file_per_table = ON, @@global.innodb_strict_mode = ON; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html connect con1,localhost,root,,; CREATE TABLE t1 (id INT NOT NULL PRIMARY KEY, @@ -106,9 +102,6 @@ DROP TABLE t1; disconnect con2; connection default; SET @@global.innodb_strict_mode = @old_innodb_strict_mode; -SET @@global.innodb_file_format = @old_innodb_file_format; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html SET @@global.innodb_file_per_table = @old_innodb_file_per_table; SET NAMES utf8; CREATE TABLE `t``\""e` (a INT, PRIMARY KEY (a)) @@ -160,4 +153,3 @@ ROLLBACK; disconnect con1; connection default; DROP TABLE `t``\""e`; -SET NAMES DEFAULT; -- cgit v1.2.1