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/r/func_in.result | |
parent | c59bff7c96bf90c9c4dafdb80684fb438bb43734 (diff) | |
parent | 809af00b0672242cc1b0fee114a34f414ec9055a (diff) | |
download | mariadb-git-96089e2b3a013c83e812672284bf10a34ba9d11c.tar.gz |
resolving conflicts
Diffstat (limited to 'mysql-test/r/func_in.result')
-rw-r--r-- | mysql-test/r/func_in.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/func_in.result b/mysql-test/r/func_in.result index 01d70c7c4c6..006dc8abef0 100644 --- a/mysql-test/r/func_in.result +++ b/mysql-test/r/func_in.result @@ -1,3 +1,4 @@ +drop table if exists t1; select 1 in (1,2,3); 1 in (1,2,3) 1 @@ -34,7 +35,6 @@ select 3.5 in (1.5,NULL,3.5); select 10.5 in (1.5,NULL,3.5); 10.5 in (1.5,NULL,3.5) NULL -drop table if exists t1; CREATE TABLE t1 (a int, b int, c int); insert into t1 values (1,2,3), (1,NULL,3); select 1 in (a,b,c) from t1; |