summaryrefslogtreecommitdiff
path: root/sql/item_cmpfunc.cc
diff options
context:
space:
mode:
authormonty@mishka.local <>2005-07-18 19:03:01 +0300
committermonty@mishka.local <>2005-07-18 19:03:01 +0300
commit2278e0319c95e5634db65bb0a85f0dafd36ec65b (patch)
tree2a23167b636e05bfda983614bbee36653c7c2c12 /sql/item_cmpfunc.cc
parent2275976fd58cf0422259bc39571fc896a41442c0 (diff)
parent78c65b5adc2b5a7160820ceed8273b684cc1e8e8 (diff)
downloadmariadb-git-2278e0319c95e5634db65bb0a85f0dafd36ec65b.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mishka.local:/home/my/mysql-5.0
Diffstat (limited to 'sql/item_cmpfunc.cc')
-rw-r--r--sql/item_cmpfunc.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index d7c117db6c0..d430d0d3c23 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -2184,7 +2184,13 @@ void Item_func_in::fix_length_and_dec()
return;
for (arg=args+1, arg_end=args+arg_count; arg != arg_end ; arg++)
- const_itm&= arg[0]->const_item();
+ {
+ if (!arg[0]->const_item())
+ {
+ const_itm= 0;
+ break;
+ }
+ }
/*
Row item with NULLs inside can return NULL or FALSE =>