summaryrefslogtreecommitdiff
path: root/mysql-test/suite/encryption/r
diff options
context:
space:
mode:
authorJan Lindström <jan.lindstrom@mariadb.com>2016-09-29 13:59:41 +0300
committerJan Lindström <jan.lindstrom@mariadb.com>2016-09-30 08:08:19 +0300
commit737295c75286a55507eadf42f4b648a118790f4d (patch)
tree0b95d6bba8ae296e4ab672cd50153e8593380a31 /mysql-test/suite/encryption/r
parentb3f7d52e1e06bd60cacc1e689aa216d1562e80b6 (diff)
downloadmariadb-git-737295c75286a55507eadf42f4b648a118790f4d.tar.gz
MDEV-10727: Merge 5.7 Innochecksum with 5.6
Diffstat (limited to 'mysql-test/suite/encryption/r')
-rw-r--r--mysql-test/suite/encryption/r/innochecksum.result4
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/suite/encryption/r/innochecksum.result b/mysql-test/suite/encryption/r/innochecksum.result
index 955d150eb04..50eafbf9f5e 100644
--- a/mysql-test/suite/encryption/r/innochecksum.result
+++ b/mysql-test/suite/encryption/r/innochecksum.result
@@ -1,4 +1,6 @@
SET GLOBAL innodb_file_format = `Barracuda`;
+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 = ON;
set global innodb_compression_algorithm = 1;
# Create and populate a tables
@@ -21,3 +23,5 @@ CREATE TABLE t5 (a INT AUTO_INCREMENT PRIMARY KEY, b TEXT) ENGINE=InnoDB PAGE_CO
# Write file to make mysql-test-run.pl start up the server again
# Cleanup
DROP TABLE t1, t2, t3, t4, t5;
+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