diff options
| author | unknown <serg@sergbook.mysql.com> | 2004-12-31 11:52:14 +0100 |
|---|---|---|
| committer | unknown <serg@sergbook.mysql.com> | 2004-12-31 11:52:14 +0100 |
| commit | 5eaf65ab4be77911eb03cceefac9ecea48c25f71 (patch) | |
| tree | e4e588771f15003e0c2b5df5cbc1cafeb3530324 /mysql-test/t/variables.test | |
| parent | 379613c3e274147f240a25b10eb677e3ee77aa34 (diff) | |
| download | mariadb-git-5eaf65ab4be77911eb03cceefac9ecea48c25f71.tar.gz | |
post-merge
mysql-test/r/grant2.result:
new test case
mysql-test/r/variables.result:
don't fail w/o innodb
mysql-test/t/grant2.test:
new test case
mysql-test/t/multi_update.test:
don't fail w/o innodb
mysql-test/t/variables.test:
don't fail w/o innodb
sql/sql_acl.cc:
cleanup
Diffstat (limited to 'mysql-test/t/variables.test')
| -rw-r--r-- | mysql-test/t/variables.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index 7dc07f9313e..3a76ae5136e 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -71,7 +71,7 @@ show variables like 'concurrent_insert'; set global concurrent_insert=DEFAULT; show variables like 'concurrent_insert'; -set storage_engine=MYISAM, storage_engine="HEAP", global storage_engine="INNODB"; +set storage_engine=MYISAM, storage_engine="HEAP", global storage_engine="MERGE"; show local variables like 'storage_engine'; show global variables like 'storage_engine'; set GLOBAL query_cache_size=100000; @@ -128,7 +128,7 @@ set max_join_size="hello"; --error 1286 set storage_engine=UNKNOWN_TABLE_TYPE; --error 1231 -set storage_engine=INNODB, big_tables=2; +set storage_engine=MERGE, big_tables=2; show local variables like 'storage_engine'; --error 1229 set SESSION query_cache_size=10000; |