diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2008-11-21 15:21:50 +0100 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2008-11-21 15:21:50 +0100 |
| commit | 33b194c36ec28528fd349dd17412848de2f1171c (patch) | |
| tree | 68cba4897925b9395dd0bfe53b5b95a777d78637 /mysql-test/r/warnings.result | |
| parent | 8d96bcda72df224f7a656cbcc1535a027bada75f (diff) | |
| parent | 1d521f6c20881997c9162bd11cadcbc77d20520b (diff) | |
| download | mariadb-git-33b194c36ec28528fd349dd17412848de2f1171c.tar.gz | |
Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or mysql-test/t/*myisam*.
However there were three new tests mysql-test/suite/parts/t/partition*myisam.test, of which I make here
copies for Maria.
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 aad8a33ea61..090ac1340ea 100644 --- a/mysql-test/r/warnings.result +++ b/mysql-test/r/warnings.result @@ -167,7 +167,7 @@ max_error_count 10 drop table t1; set table_type=MYISAM; Warnings: -Warning 1287 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'; |