diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2008-03-10 07:07:56 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2008-03-10 07:07:56 +0100 |
| commit | 111de516ab972f076f5b6ec2399874391bfeb473 (patch) | |
| tree | 51f2d1b0305bb5e58ebf2fe09ba255c8efdd44e2 /sql/item.h | |
| parent | 4a8c442f040db67763697df8f109f79ec6240979 (diff) | |
| parent | a0eec8abbb233d9e3f278d343eaed2e70b55161e (diff) | |
| download | mariadb-git-111de516ab972f076f5b6ec2399874391bfeb473.tar.gz | |
Merge mysql.com:/misc/mysql/34749/50-34749
into mysql.com:/misc/mysql/34749/51-34749
mysql-test/r/func_misc.result:
Auto merged
mysql-test/t/func_misc.test:
Auto merged
sql/ha_ndbcluster_cond.cc:
Auto merged
sql/ha_ndbcluster_cond.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.h:
Auto merged
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sql/item.h b/sql/item.h index b98389bc8d4..7cae7a20861 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1244,14 +1244,7 @@ class Item_name_const : public Item Item *name_item; bool valid_args; public: - Item_name_const(Item *name_arg, Item *val): - value_item(val), name_item(name_arg) - { - 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; - } + Item_name_const(Item *name_arg, Item *val); bool fix_fields(THD *, Item **); |