diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-02-23 09:18:48 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-02-23 09:18:48 +0100 |
| commit | 3cda92aece63a1d1d7f0f37e0e6c2535d2022e62 (patch) | |
| tree | b7b2acac705f599527734636f1221d06f67a0d99 /mysql-test/r/merge_debug.result | |
| parent | a19a4618e3c569afea08d5fe02ea3da2426415d6 (diff) | |
| download | mariadb-git-3cda92aece63a1d1d7f0f37e0e6c2535d2022e62.tar.gz | |
don't even try to run xtradb-only tests with innodb, use have_xtradb.combinations.
Diffstat (limited to 'mysql-test/r/merge_debug.result')
| -rw-r--r-- | mysql-test/r/merge_debug.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/merge_debug.result b/mysql-test/r/merge_debug.result index ff7222ac0f3..d6ca17f0659 100644 --- a/mysql-test/r/merge_debug.result +++ b/mysql-test/r/merge_debug.result @@ -1,3 +1,4 @@ +set @default_storage_engine= @@global.storage_engine; set global storage_engine=myisam; set session storage_engine=myisam; drop table if exists crashed,t2,t3,t4; @@ -22,3 +23,4 @@ INSERT INTO t3 VALUES (31); UNLOCK TABLES; DROP TRIGGER t1_ai; DROP TABLE t4,crashed,t2,t3; +set global storage_engine=@default_storage_engine; |