summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <cmiller@zippy.cornsilk.net>2006-11-06 23:03:31 -0500
committerunknown <cmiller@zippy.cornsilk.net>2006-11-06 23:03:31 -0500
commite609c1096430643d88e973af6d5e26d3e80ec2f7 (patch)
tree50417182635d561ffda4e48f0e4a9c4a02529199 /mysql-test
parentc0718d730197b0b2289f497bdfc7bca2bca49975 (diff)
parente3f0e67b8fbe5c6b020dec8daf0f3622202e8911 (diff)
downloadmariadb-git-e609c1096430643d88e973af6d5e26d3e80ec2f7.tar.gz
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint mysql-test/r/func_test.result: Auto merged
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/func_test.result1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/r/func_test.result b/mysql-test/r/func_test.result
index efae9e9f2fc..9a5cc666ca8 100644
--- a/mysql-test/r/func_test.result
+++ b/mysql-test/r/func_test.result
@@ -256,6 +256,7 @@ NULL
NULL
select mod(NULL, 2.0) as 'NULL';
NULL
+NULL
create table t1 (a int, b int);
insert into t1 values (1,2), (2,3), (3,4), (4,5);
select * from t1 where a not between 1 and 2;