diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-06-22 17:01:39 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-06-22 17:01:39 +0400 |
| commit | a96267c19936d8528a7ff9cc82ff88f5a5938221 (patch) | |
| tree | 02c1426e2ba845a12088a372d8019c21c3bd2497 /mysql-test/suite/innodb/t/innodb-autoinc.test | |
| parent | c388c044e00d193801fee45fe9e3c0d7eac928e7 (diff) | |
| parent | 7657ee10f8be9ed041e3e215b4e2e8cb933abe60 (diff) | |
| download | mariadb-git-a96267c19936d8528a7ff9cc82ff88f5a5938221.tar.gz | |
Auto-merge from mysql-trunk-bugfixing.
Diffstat (limited to 'mysql-test/suite/innodb/t/innodb-autoinc.test')
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb-autoinc.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/innodb/t/innodb-autoinc.test b/mysql-test/suite/innodb/t/innodb-autoinc.test index c1cae16153e..a8e853baef7 100644 --- a/mysql-test/suite/innodb/t/innodb-autoinc.test +++ b/mysql-test/suite/innodb/t/innodb-autoinc.test @@ -2,7 +2,7 @@ # embedded server ignores 'delayed', so skip this -- source include/not_embedded.inc -let $innodb_file_format_check_orig=`select @@innodb_file_format_check`; +let $innodb_file_format_max_orig=`select @@innodb_file_format_max`; --disable_warnings drop table if exists t1; @@ -671,4 +671,4 @@ DROP TABLE t1; # -- disable_query_log -eval SET GLOBAL innodb_file_format_check=$innodb_file_format_check_orig; +eval SET GLOBAL innodb_file_format_max=$innodb_file_format_max_orig; |