diff options
| author | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-07-14 16:58:51 +0500 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-07-14 16:58:51 +0500 |
| commit | e7ea49dc0d6d4e958cf2a515edcf0fdfc99b8199 (patch) | |
| tree | 632373d6cd3e5177ddb98e588ef070d63b039193 /mysql-test | |
| parent | ae3d1248efaba7501cdee77718fd5976fddf9b3a (diff) | |
| parent | 39f9adfa849a9763dd883fd4661eb9ddfb47d576 (diff) | |
| download | mariadb-git-e7ea49dc0d6d4e958cf2a515edcf0fdfc99b8199.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1.b15195
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/warnings.result | 7 | ||||
| -rw-r--r-- | mysql-test/t/warnings-master.opt | 2 | ||||
| -rw-r--r-- | mysql-test/t/warnings.test | 4 |
3 files changed, 12 insertions, 1 deletions
diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result index b9c05bc388c..69d33de75f4 100644 --- a/mysql-test/r/warnings.result +++ b/mysql-test/r/warnings.result @@ -171,6 +171,13 @@ alter table t1 engine=isam; Warnings: Warning 1266 Using storage engine MyISAM for table 't1' drop table t1; +create table t1 (id int) engine=merge; +Warnings: +Warning 1266 Using storage engine MyISAM for table 't1' +alter table t1 engine=merge; +Warnings: +Warning 1266 Using storage engine MyISAM for table 't1' +drop table t1; create table t1 (id int) type=heap; Warnings: Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead diff --git a/mysql-test/t/warnings-master.opt b/mysql-test/t/warnings-master.opt index 3b8baeddb14..e924a22e2ce 100644 --- a/mysql-test/t/warnings-master.opt +++ b/mysql-test/t/warnings-master.opt @@ -1 +1 @@ ---skip-isam +--skip-isam --skip-merge diff --git a/mysql-test/t/warnings.test b/mysql-test/t/warnings.test index 4bc8a338a35..aee03b39353 100644 --- a/mysql-test/t/warnings.test +++ b/mysql-test/t/warnings.test @@ -118,6 +118,10 @@ create table t1 (id int) engine=isam; alter table t1 engine=isam; drop table t1; +create table t1 (id int) engine=merge; +alter table t1 engine=merge; +drop table t1; + # # Test for deprecated TYPE= syntax # |