diff options
| author | unknown <tsmith@maint1.mysql.com> | 2006-08-03 10:41:14 +0200 |
|---|---|---|
| committer | unknown <tsmith@maint1.mysql.com> | 2006-08-03 10:41:14 +0200 |
| commit | 15e27e48323aa76577c2919ff68fa58d60f6a049 (patch) | |
| tree | 057555e9fa7d4b37fac3e49cbe3a8824c85ad9b5 /mysql-test/r/warnings.result | |
| parent | eafb7605797830cc8fbcdfbbabb90ef5425df1c3 (diff) | |
| parent | 93eef69dd517557255c4947b3d99f9fb0967fb5e (diff) | |
| download | mariadb-git-15e27e48323aa76577c2919ff68fa58d60f6a049.tar.gz | |
Merge maint1.mysql.com:/data/localhome/tsmith/bk/mrg50-c
into maint1.mysql.com:/data/localhome/tsmith/bk/mrg51-c
mysql-test/t/warnings.test:
5.0 -> 5.1 manual merge, part 3 of 3 (or more?)
sql/handler.cc:
5.0 -> 5.1 manual merge, part 3 of 3 (or more?)
sql/mysql_priv.h:
5.0 -> 5.1 manual merge, part 3 of 3 (or more?)
sql/mysqld.cc:
5.0 -> 5.1 manual merge, part 3 of 3 (or more?)
sql/set_var.cc:
5.0 -> 5.1 manual merge, part 3 of 3 (or more?)
mysql-test/r/warnings.result:
5.0 -> 5.1 manual merge, part 3 of 3 (or more?)
Diffstat (limited to 'mysql-test/r/warnings.result')
| -rw-r--r-- | mysql-test/r/warnings.result | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result index 47c5dec3dd4..78948e47562 100644 --- a/mysql-test/r/warnings.result +++ b/mysql-test/r/warnings.result @@ -166,6 +166,20 @@ show variables like 'max_error_count'; Variable_name Value max_error_count 10 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 +alter table t1 type=myisam; +Warnings: +Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead +drop table t1; set table_type=MYISAM; Warnings: Warning 1541 The syntax 'table_type' is deprecated and will be removed in MySQL 5.2. Please use 'storage_engine' instead. |