diff options
| author | tnurnberg@white.intern.koehntopp.de <> | 2008-03-10 07:39:04 +0100 |
|---|---|---|
| committer | tnurnberg@white.intern.koehntopp.de <> | 2008-03-10 07:39:04 +0100 |
| commit | f5b93ab932e073d6a5cc14663afea8156b56c10d (patch) | |
| tree | e4309a3644ca5bfbf3347fe466489222fbe701d3 /sql/item.h | |
| parent | 10bf47abf3a1234ab1fa1114eb517018f3dc953d (diff) | |
| parent | fd2bae99818d9d0b528abca8a00d2147a72dde1b (diff) | |
| download | mariadb-git-f5b93ab932e073d6a5cc14663afea8156b56c10d.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into mysql.com:/misc/mysql/34749/51-34749
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 2f85d46a90a..b23b1171843 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1245,14 +1245,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 **); |