diff options
| author | tsmith@maint1.mysql.com <> | 2007-06-26 13:15:43 +0200 |
|---|---|---|
| committer | tsmith@maint1.mysql.com <> | 2007-06-26 13:15:43 +0200 |
| commit | 26398867119f06a05dbf6cb6412fca4f20cda52a (patch) | |
| tree | 8e814588deea22ca36d9f472a2e95e47d92aa8a9 /mysql-test/r/warnings.result | |
| parent | 79677b756efa3ddfb2c835145f27d2cebc948a0e (diff) | |
| download | mariadb-git-26398867119f06a05dbf6cb6412fca4f20cda52a.tar.gz | |
Bug #29245: Bad Merge Caused Error Codes Conflict between 5.0/5.1
Fix some error messages so that all error codes are equivalent in 5.0 and 5.1
Diffstat (limited to 'mysql-test/r/warnings.result')
| -rw-r--r-- | mysql-test/r/warnings.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result index 01b1c77887f..2929328a9b1 100644 --- a/mysql-test/r/warnings.result +++ b/mysql-test/r/warnings.result @@ -168,7 +168,7 @@ max_error_count 10 drop table t1; set table_type=MYISAM; Warnings: -Warning 1543 The syntax 'table_type' is deprecated and will be removed in MySQL 5.2. Please use 'storage_engine' instead +Warning 1287 The syntax 'table_type' is deprecated and will be removed in MySQL 5.2. Please use 'storage_engine' instead create table t1 (a int); insert into t1 (a) values (1), (2), (3), (4), (5), (6), (7), (8), (9), (10); update t1 set a='abc'; |