database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1

Browse Source 
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
This commit is contained in:
unknown
2006-08-16 10:03:24 -07:00
parent 804b99b271 2a56517972
commit 035137fe02
554 changed files with 5432 additions and 194755 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/warnings.result
View File

@ -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';