diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2013-07-08 18:15:50 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2013-07-08 18:15:50 +0400 |
| commit | 66f1a848f44748ba2fd31c2463f6b73ae45d5f1f (patch) | |
| tree | 51c8b8be7292c128a2b7e03671cee7307a8b1690 /mysql-test | |
| parent | d82b512535daf5a55fedcd7c29a540d849ceb1c6 (diff) | |
| parent | 964d42631c642a80f9d2c68856f438fc79a2acf8 (diff) | |
| download | mariadb-git-66f1a848f44748ba2fd31c2463f6b73ae45d5f1f.tar.gz | |
Automatic merge
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/myisam.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result index 6c0826775ad..bbd14a3bb6c 100644 --- a/mysql-test/r/myisam.result +++ b/mysql-test/r/myisam.result @@ -454,7 +454,7 @@ a b c drop table t1; DROP TABLE IF EXISTS t1; Warnings: -Note 1051 Unknown table 't1' +Note 1051 Unknown table 'test.t1' CREATE TABLE t1 (a varchar(150) NOT NULL, KEY (a)); INSERT t1 VALUES ("can \tcan"); INSERT t1 VALUES ("can can"); @@ -618,7 +618,7 @@ t1 1 a 1 a A 1000 NULL NULL YES BTREE alter table t1 engine=heap; alter table t1 disable keys; Warnings: -Note 1031 Table storage engine for 't1' doesn't have this option +Note 1031 Storage engine MEMORY of the table `test`.`t1` doesn't have this option show keys from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment t1 1 a 1 a NULL 500 NULL NULL YES HASH |