diff options
| author | unknown <lars@mysql.com/black.(none)> | 2006-11-13 12:44:53 +0100 |
|---|---|---|
| committer | unknown <lars@mysql.com/black.(none)> | 2006-11-13 12:44:53 +0100 |
| commit | 181c9b4dd4c23c5ef4d8c2562c055e35b6267bfe (patch) | |
| tree | 2e35d48c7436cf853a6515a4dccc4e72660d82f3 /mysql-test/include | |
| parent | 383fbde53239a9d4fd4e444a0b6d8942305f74f5 (diff) | |
| parent | 7614eb0d1db4819ec6f1c3c59196d1dcb0d0c8d5 (diff) | |
| download | mariadb-git-181c9b4dd4c23c5ef4d8c2562c055e35b6267bfe.tar.gz | |
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
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/strict_autoinc.inc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/include/strict_autoinc.inc b/mysql-test/include/strict_autoinc.inc index 6960440f3a7..823efcc2040 100644 --- a/mysql-test/include/strict_autoinc.inc +++ b/mysql-test/include/strict_autoinc.inc @@ -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 ( |