diff options
| author | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-11-29 10:23:30 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-11-29 10:23:30 +0400 |
| commit | b9c4817058ea791db0f623b7c50093296e475de2 (patch) | |
| tree | 9cb2ae2bcf1e885fb7cbbe108d621886cae1c9a2 /sql/item.h | |
| parent | 18489d1052c96b912e1ff8127f10a63e1743bd92 (diff) | |
| parent | ba974f83712e458275ac2a3d2a803c36871cf4f0 (diff) | |
| download | mariadb-git-b9c4817058ea791db0f623b7c50093296e475de2.tar.gz | |
Merge mysql.com:/home/ram/work/b32559/b32559.5.0
into mysql.com:/home/ram/work/b32559/b32559.5.1
mysql-test/r/func_misc.result:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
mysql-test/t/func_misc.test:
manual merge.
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index 379eb8a24be..2219153616b 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1242,11 +1242,13 @@ class Item_name_const : public Item { Item *value_item; Item *name_item; + bool valid_args; public: Item_name_const(Item *name_arg, Item *val): value_item(val), name_item(name_arg) { - if(!value_item->basic_const_item()) + if (!(valid_args= name_item->basic_const_item() & + value_item->basic_const_item())) my_error(ER_WRONG_ARGUMENTS, MYF(0), "NAME_CONST"); Item::maybe_null= TRUE; } |