summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2003-12-10 00:01:01 +0200
committerunknown <monty@mysql.com>2003-12-10 00:01:01 +0200
commitc8fbf887bca7523eeadffe3d3a414391a6537c78 (patch)
tree11ec8922a0e9f8de7f1fb0e76e213881ae9bcc3d /sql
parent870ec769f12e6f32128bfec5c1f88252998a43de (diff)
parent6b97c26a29127f73c699aaa13ffb5ae9f33703cf (diff)
downloadmariadb-git-c8fbf887bca7523eeadffe3d3a414391a6537c78.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/my/mysql-4.0
Diffstat (limited to 'sql')
-rw-r--r--sql/item_strfunc.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index dd1ec6bd2da..40b18755744 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -2043,6 +2043,10 @@ String* Item_func_export_set::val_str(String* str)
null_value=1;
return 0;
}
+ /*
+ Arg count can only be 3, 4 or 5 here. This is guaranteed from the
+ grammar for EXPORT_SET()
+ */
switch(arg_count) {
case 5:
num_set_values = (uint) args[4]->val_int();