diff options
| author | unknown <patg@govinda.patg.net> | 2006-08-16 10:03:24 -0700 |
|---|---|---|
| committer | unknown <patg@govinda.patg.net> | 2006-08-16 10:03:24 -0700 |
| commit | a6682dcb9a5916dc2ba5d94f538a507ff73e433b (patch) | |
| tree | c720bb36b6625faf7fa0b8903bd8cc39e711d1a3 /mysql-test/r/warnings.result | |
| parent | 1d3a13a95d730b8d1c9123aeeb886cee7513f80a (diff) | |
| parent | e1df39a50e75ffdc855ee38aa2d85b091d605ec1 (diff) | |
| download | mariadb-git-a6682dcb9a5916dc2ba5d94f538a507ff73e433b.tar.gz | |
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1
into govinda.patg.net:/home/patg/mysql-build/mysql-5.1-clean2
mysql-test/r/warnings.result:
Auto merged
sql/ha_federated.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
BitKeeper/deleted/.del-ps_6bdb.result:
Auto merged
sql/share/errmsg.txt:
SCCS merged
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 41b1b4ecb06..a2161a02475 100644 --- a/mysql-test/r/warnings.result +++ b/mysql-test/r/warnings.result @@ -175,7 +175,7 @@ Warning 1266 Using storage engine MyISAM for table 't1' 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. +Warning 1541 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'; |