diff options
| author | unknown <hf@deer.(none)> | 2004-01-19 21:06:27 +0400 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-01-19 21:06:27 +0400 |
| commit | 73a5742881fd2c38e9695887bcb607aa75ee0ac1 (patch) | |
| tree | 68d020ad65ffc40d49179abe19fb94245bfbf5d6 /mysql-test/r/warnings.result | |
| parent | 75a9472678b3ed2f4d23e70a4a402e1c828c12b4 (diff) | |
| parent | 5c57c6ce2edde35837e9ef8e26e66dff5be6b2a8 (diff) | |
| download | mariadb-git-73a5742881fd2c38e9695887bcb607aa75ee0ac1.tar.gz | |
Merge deer.(none):/home/hf/work/mysql-4.1.clean
into deer.(none):/home/hf/work/mysql-4.1.1676
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'mysql-test/r/warnings.result')
| -rw-r--r-- | mysql-test/r/warnings.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result index 5c7c75bac00..c3d9f165fed 100644 --- a/mysql-test/r/warnings.result +++ b/mysql-test/r/warnings.result @@ -128,10 +128,10 @@ Warning 1265 Using storage engine MyISAM for table 't1' drop table t1; create table t1 (id int) type=heap; Warnings: -Warning 1286 'TYPE=database_engine' is deprecated. Use 'ENGINE=database_engine' instead. +Warning 1286 'TYPE=storage_engine' is deprecated. Use 'ENGINE=storage_engine' instead. alter table t1 type=myisam; Warnings: -Warning 1286 'TYPE=database_engine' is deprecated. Use 'ENGINE=database_engine' instead. +Warning 1286 'TYPE=storage_engine' is deprecated. Use 'ENGINE=storage_engine' instead. drop table t1; set table_type=MYISAM; Warnings: |