diff options
| author | Luis Soares <luis.soares@sun.com> | 2009-11-13 10:17:53 +0000 |
|---|---|---|
| committer | Luis Soares <luis.soares@sun.com> | 2009-11-13 10:17:53 +0000 |
| commit | 27b1c660e3f654d1d616fc4c03c9c74716acf9e0 (patch) | |
| tree | 5107afeb0f71e17a7fcdff3685ea606313d1aa3c /mysql-test/r/warnings.result | |
| parent | 794ccfc378e7476b14c0648a7473fe2ff8b618c8 (diff) | |
| parent | 7d3708636a7296206ca2f49b62a16c0c5ad7f7ef (diff) | |
| download | mariadb-git-27b1c660e3f654d1d616fc4c03c9c74716acf9e0.tar.gz | |
manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)
CONFLICTS
=========
Text conflict in sql/sql_yacc.yy
1 conflicts encountered.
Diffstat (limited to 'mysql-test/r/warnings.result')
| -rw-r--r-- | mysql-test/r/warnings.result | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result index 8a87852d582..229621435f2 100644 --- a/mysql-test/r/warnings.result +++ b/mysql-test/r/warnings.result @@ -166,9 +166,6 @@ show variables like 'max_error_count'; Variable_name Value 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 6.0. 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'; |