diff options
author | unknown <knielsen@knielsen-hq.org> | 2010-01-30 10:00:14 +0100 |
---|---|---|
committer | unknown <knielsen@knielsen-hq.org> | 2010-01-30 10:00:14 +0100 |
commit | e8631758fe6bac6b13187f372809366792920cd7 (patch) | |
tree | b4e7251729b81216e6d66d5bf8dee7d7c315cc26 /mysql-test/r/innodb_bug36169.result | |
parent | acb7de23306ce0b311344d679e8c63160ad32a49 (diff) | |
parent | e9bce6c9d4bde35306b845e22e9b5ada69c4512f (diff) | |
download | mariadb-git-e8631758fe6bac6b13187f372809366792920cd7.tar.gz |
Automerge from main into MariaDB 5.1.42 release branch.
Diffstat (limited to 'mysql-test/r/innodb_bug36169.result')
-rw-r--r-- | mysql-test/r/innodb_bug36169.result | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/r/innodb_bug36169.result b/mysql-test/r/innodb_bug36169.result index 0f43ab23f7a..aa80e4d7aa4 100644 --- a/mysql-test/r/innodb_bug36169.result +++ b/mysql-test/r/innodb_bug36169.result @@ -1,4 +1,2 @@ -set @old_innodb_file_format=@@innodb_file_format; -set @old_innodb_file_per_table=@@innodb_file_per_table; SET GLOBAL innodb_file_format='Barracuda'; SET GLOBAL innodb_file_per_table=ON; |