diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-04-09 23:27:07 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-09 23:27:07 +0200 |
| commit | 3ad01d00f2eaef56ed06041f7ac26328e998155b (patch) | |
| tree | 5706c35dec4d795803c282e6a9c2feba566e0d6c /mysql-test/r/merge.result | |
| parent | ffbd15eb3242ab9b003c025925a462b5bd24a761 (diff) | |
| download | mariadb-git-3ad01d00f2eaef56ed06041f7ac26328e998155b.tar.gz | |
error messages: name the storage engine explicitly,
instead of "used storage engine" and similar changes.
Diffstat (limited to 'mysql-test/r/merge.result')
| -rw-r--r-- | mysql-test/r/merge.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result index 83a4caac919..5c4261e7d6d 100644 --- a/mysql-test/r/merge.result +++ b/mysql-test/r/merge.result @@ -2257,7 +2257,7 @@ CREATE TABLE m1(a int)engine=merge union=(t1,t2,t3,t4,t5,t6,t7); SELECT 1 FROM m1; 1 HANDLER m1 OPEN; -ERROR HY000: Table storage engine for 'm1' doesn't have this option +ERROR HY000: Storage engine MRG_MyISAM of the table `test`.`m1` doesn't have this option DROP TABLE m1,t1,t2,t3,t4,t5,t6,t7; SELECT 1 FROM m1; ERROR 42S02: Table 'test.m1' doesn't exist @@ -3552,7 +3552,7 @@ CREATE TABLE t2 (c1 int); CREATE TABLE t3 (c1 int) ENGINE = MERGE UNION (t1,t2); START TRANSACTION; HANDLER t3 OPEN; -ERROR HY000: Table storage engine for 't3' doesn't have this option +ERROR HY000: Storage engine MRG_MyISAM of the table `test`.`t3` doesn't have this option DROP TABLE t1, t2, t3; # Connection default. # Disconnecting con1, all mdl_tickets must have been released. |