diff options
| author | hf@deer.mysql.r18.ru <> | 2003-01-15 13:15:35 +0400 |
|---|---|---|
| committer | hf@deer.mysql.r18.ru <> | 2003-01-15 13:15:35 +0400 |
| commit | 96089e2b3a013c83e812672284bf10a34ba9d11c (patch) | |
| tree | 937beb6f27e5e7958081a4a5ba13ceb2f5251396 /mysql-test/t/innodb.test | |
| parent | c59bff7c96bf90c9c4dafdb80684fb438bb43734 (diff) | |
| parent | 809af00b0672242cc1b0fee114a34f414ec9055a (diff) | |
| download | mariadb-git-96089e2b3a013c83e812672284bf10a34ba9d11c.tar.gz | |
resolving conflicts
Diffstat (limited to 'mysql-test/t/innodb.test')
| -rw-r--r-- | mysql-test/t/innodb.test | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test index eb5b0c9efd2..e875bf883c7 100644 --- a/mysql-test/t/innodb.test +++ b/mysql-test/t/innodb.test @@ -4,7 +4,10 @@ # Small basic test with ignore # +--disable_warnings drop table if exists t1,t2; +--enable_warnings + create table t1 (id int unsigned not null auto_increment, code tinyint unsigned not null, name char(20) not null, primary key (id), key (code), unique (name)) type=innodb; insert into t1 (code, name) values (1, 'Tim'), (1, 'Monty'), (2, 'David'), (2, 'Erik'), (3, 'Sasha'), (3, 'Jeremy'), (4, 'Matt'); @@ -664,7 +667,6 @@ DROP TABLE t1; # # Test of multi-table-update # -drop table if exists t1,t2; create table t1 (n int(10), d int(10)) type=innodb; create table t2 (n int(10), d int(10)) type=innodb; insert into t1 values(1,1),(1,2); |