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/odbc.test | |
parent | c59bff7c96bf90c9c4dafdb80684fb438bb43734 (diff) | |
parent | 809af00b0672242cc1b0fee114a34f414ec9055a (diff) | |
download | mariadb-git-96089e2b3a013c83e812672284bf10a34ba9d11c.tar.gz |
resolving conflicts
Diffstat (limited to 'mysql-test/t/odbc.test')
-rw-r--r-- | mysql-test/t/odbc.test | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mysql-test/t/odbc.test b/mysql-test/t/odbc.test index 3e0fc214d3e..9aac5948359 100644 --- a/mysql-test/t/odbc.test +++ b/mysql-test/t/odbc.test @@ -1,3 +1,8 @@ +# Initialise +--disable_warnings +drop table if exists t1; +--enable_warnings + # # Test some ODBC compatibility # @@ -8,7 +13,6 @@ select {fn length("hello")}, { date "1997-10-20" }; # Test retreiving row with last insert_id value. # -drop table if exists t1; create table t1 (a int not null auto_increment,b int not null,primary key (a,b)); insert into t1 SET A=NULL,B=1; insert into t1 SET a=null,b=2; |