summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <gluh@gluh.mysql.r18.ru>2004-03-16 11:33:36 +0400
committerunknown <gluh@gluh.mysql.r18.ru>2004-03-16 11:33:36 +0400
commitcc5b1779c85fad2496a72602c3f908d0dad9aa0b (patch)
tree062b3297b58f018ea7c799a894c96ce1a72635a1 /mysql-test
parent277cf702da7e6f0642742eb10582cfc382e537ec (diff)
parent5adbc611dd70bcba787e4c2b8c264a0253cdd875 (diff)
downloadmariadb-git-cc5b1779c85fad2496a72602c3f908d0dad9aa0b.tar.gz
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/Bugs/mysql-4.0.3067
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/func_if.result6
-rw-r--r--mysql-test/t/func_if.test6
2 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/r/func_if.result b/mysql-test/r/func_if.result
index 0ab41258091..470004d2646 100644
--- a/mysql-test/r/func_if.result
+++ b/mysql-test/r/func_if.result
@@ -40,6 +40,12 @@ a
aa
aaa
drop table t1;
+select NULLIF(NULL,NULL), NULLIF(NULL,1), NULLIF(NULL,1.0), NULLIF(NULL,"test");
+NULLIF(NULL,NULL) NULLIF(NULL,1) NULLIF(NULL,1.0) NULLIF(NULL,"test")
+NULL NULL NULL NULL
+select NULLIF(1,NULL), NULLIF(1.0, NULL), NULLIF("test", NULL);
+NULLIF(1,NULL) NULLIF(1.0, NULL) NULLIF("test", NULL)
+1 1.0 test
create table t1 (num double(12,2));
insert into t1 values (144.54);
select sum(if(num is null,0.00,num)) from t1;
diff --git a/mysql-test/t/func_if.test b/mysql-test/t/func_if.test
index 85553d1a2fd..1f95239bf4b 100644
--- a/mysql-test/t/func_if.test
+++ b/mysql-test/t/func_if.test
@@ -21,6 +21,12 @@ select if(u=1,st,binary st) s from t1 where st like "%a%" order by s;
drop table t1;
#
+# Bug 2629
+#
+select NULLIF(NULL,NULL), NULLIF(NULL,1), NULLIF(NULL,1.0), NULLIF(NULL,"test");
+select NULLIF(1,NULL), NULLIF(1.0, NULL), NULLIF("test", NULL);
+
+#
# Problem with IF()
#