diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-03 03:06:42 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-03 03:06:42 +0300 |
| commit | 0ce6d93f858eb5b67f8988946274ab2b9f060de4 (patch) | |
| tree | 8555c47c0ce18227ce535252d2c2966af26183d3 /mysql-test/r/create.result | |
| parent | c2fe19883e624ddd0e37768f860fa0853848adb3 (diff) | |
| parent | e698ae01128fde4f82d4595e67a72cfac09ca125 (diff) | |
| download | mariadb-git-0ce6d93f858eb5b67f8988946274ab2b9f060de4.tar.gz | |
Merge next-mr -> next-4284.
Diffstat (limited to 'mysql-test/r/create.result')
| -rw-r--r-- | mysql-test/r/create.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result index 66439593c7c..09d14188d0e 100644 --- a/mysql-test/r/create.result +++ b/mysql-test/r/create.result @@ -228,7 +228,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MEMORY DEFAULT CHARSET=latin1 drop table t1; SET SESSION storage_engine="gemini"; -ERROR 42000: Unknown table engine 'gemini' +ERROR 42000: Unknown storage engine 'gemini' SELECT @@storage_engine; @@storage_engine MEMORY @@ -389,7 +389,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MEMORY DEFAULT CHARSET=latin1 drop table t1; SET SESSION storage_engine="gemini"; -ERROR 42000: Unknown table engine 'gemini' +ERROR 42000: Unknown storage engine 'gemini' SELECT @@storage_engine; @@storage_engine MEMORY |