diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2008-03-10 07:11:12 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2008-03-10 07:11:12 +0100 |
| commit | 0abcb8ca5e3662d230446907469dc4facbb755ad (patch) | |
| tree | 477d576fb5af67a1034d2f5b15af2e768d260a1c /sql/item.h | |
| parent | 9ddecde483e5c5e8bbb82e1108d88ab08760233d (diff) | |
| parent | a0eec8abbb233d9e3f278d343eaed2e70b55161e (diff) | |
| download | mariadb-git-0abcb8ca5e3662d230446907469dc4facbb755ad.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into mysql.com:/misc/mysql/34749/50-34749
mysql-test/r/func_misc.result:
Auto merged
mysql-test/t/func_misc.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.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 c8b8e48b0ed..8cd84c3bc13 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1114,14 +1114,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 **); |