summaryrefslogtreecommitdiff
path: root/mysql-test/suite/sys_vars
diff options
context:
space:
mode:
authorJimmy Yang <jimmy.yang@oracle.com>2011-01-14 23:24:47 -0800
committerJimmy Yang <jimmy.yang@oracle.com>2011-01-14 23:24:47 -0800
commitc4c90d912ad8ea654e3dfe84638568b3a7e33780 (patch)
tree16c4aeaa65f1fac8cca4d0ff4f0b3353e0a5b492 /mysql-test/suite/sys_vars
parent8c95b3c3d4cff6c5b31fb75d79d65b34087a986f (diff)
parent669ce69483b801599f9dfd9890b4dbb2e60ff03e (diff)
downloadmariadb-git-c4c90d912ad8ea654e3dfe84638568b3a7e33780.tar.gz
Merge from mysql-5.1-innodb to mysql-5.5-innodb
Diffstat (limited to 'mysql-test/suite/sys_vars')
-rw-r--r--mysql-test/suite/sys_vars/r/all_vars.result2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/suite/sys_vars/r/all_vars.result b/mysql-test/suite/sys_vars/r/all_vars.result
index e635f1201a3..418330f078d 100644
--- a/mysql-test/suite/sys_vars/r/all_vars.result
+++ b/mysql-test/suite/sys_vars/r/all_vars.result
@@ -11,7 +11,9 @@ There should be *no* long test name listed below:
select variable_name as `There should be *no* variables listed below:` from t2
left join t1 on variable_name=test_name where test_name is null;
There should be *no* variables listed below:
+INNODB_STATS_METHOD
INNODB_FILE_FORMAT_MAX
+INNODB_STATS_METHOD
INNODB_FILE_FORMAT_MAX
drop table t1;
drop table t2;