Merge mysql.com:/home/bkroot/mysql-5.0-rpl

into  mysql.com:/home/bk/MERGE/mysql-5.0-merge


BitKeeper/etc/collapsed:
  auto-union
sql/mysql_priv.h:
  Auto merged
sql/slave.cc:
  Auto merged
This commit is contained in:
unknown 2006-11-13 12:44:53 +01:00
commit 181c9b4dd4
41 changed files with 966 additions and 232 deletions

View file

@ -2,6 +2,10 @@
# Test for strict-mode autoincrement
#
--disable_warnings
drop table if exists t1;
--enable_warnings
set @org_mode=@@sql_mode;
eval create table t1
(