summaryrefslogtreecommitdiff
path: root/sql/item_strfunc.cc
diff options
context:
space:
mode:
authorunknown <sasha@mysql.sashanet.com>2000-11-03 07:04:33 -0700
committerunknown <sasha@mysql.sashanet.com>2000-11-03 07:04:33 -0700
commit0caff03f20f2141c2289a45448d5bc898e65c8df (patch)
tree5ee24e3e58295b7a4a6a0b779c5c380b4ab7891f /sql/item_strfunc.cc
parent19a3899e2e03c4de83c5d6fd2aab1c28b21d2798 (diff)
downloadmariadb-git-0caff03f20f2141c2289a45448d5bc898e65c8df.tar.gz
fixed bugs in elt() and make_set()
added two new test cases BitKeeper/etc/ignore: Added mysql-test/r/3.23/sel000004.result.reject mysql-test/var/lib/mysql-bin.006 mysql-test/var/lib/test/elt_ck1.frm mysql-test/var/lib/test/elt_ck1.MYD mysql-test/var/lib/test/elt_ck1.MYI mysql-test/var/lib/test/elt_ck2.frm mysql-test/var/lib/test/elt_ck2.MYD mysql-test/var/lib/test/elt_ck2.MYI to the ignore list mysql-test/r/3.23/sel000004.result: new result mysql-test/r/3.23/sel000005.result: new result sql/item_strfunc.cc: fixed bug in make_set() and elt()
Diffstat (limited to 'sql/item_strfunc.cc')
-rw-r--r--sql/item_strfunc.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index a52b9a85857..c6a5427b444 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -1190,6 +1190,7 @@ void Item_func_elt::fix_length_and_dec()
}
maybe_null=1; // NULL if wrong first arg
used_tables_cache|=item->used_tables();
+ const_item_cache&=item->const_item();
}
@@ -1245,6 +1246,7 @@ void Item_func_make_set::fix_length_and_dec()
for (uint i=1 ; i < arg_count ; i++)
max_length+=args[i]->max_length;
used_tables_cache|=item->used_tables();
+ const_item_cache&=item->const_item();
}