diff options
| author | unknown <hf@deer.mysql.r18.ru> | 2003-01-22 20:08:12 +0400 |
|---|---|---|
| committer | unknown <hf@deer.mysql.r18.ru> | 2003-01-22 20:08:12 +0400 |
| commit | c73e02756f3f08e1c1decd903aa7a1052ba231a3 (patch) | |
| tree | e6c817b6f680cd04d4a4d3cbea3962d434941db7 /sql/item.h | |
| parent | 96b86dcc9a1e87f01f73186308e8c35f6f900452 (diff) | |
| download | mariadb-git-c73e02756f3f08e1c1decd903aa7a1052ba231a3.tar.gz | |
SCRUM
DEFAULT in SELECT & UPDATE corrections
mysql-test/r/replace.result:
test slightly extended
mysql-test/t/replace.test:
test slightly extended with replace(default)
sql/item.cc:
DEFAULT_ITEM replaced
sql/item.h:
some modifications after talking with Sergey
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sql/item.h b/sql/item.h index 1881b15f6e5..ee68563d5cf 100644 --- a/sql/item.h +++ b/sql/item.h @@ -33,7 +33,7 @@ public: enum Type {FIELD_ITEM, FUNC_ITEM, SUM_FUNC_ITEM, STRING_ITEM, INT_ITEM, REAL_ITEM, NULL_ITEM, VARBIN_ITEM, - COPY_STR_ITEM, FIELD_AVG_ITEM, DEFAULT_ITEM, + COPY_STR_ITEM, FIELD_AVG_ITEM, DEFAULT_VALUE_ITEM, PROC_ITEM,COND_ITEM, REF_ITEM, FIELD_STD_ITEM, FIELD_VARIANCE_ITEM, CONST_ITEM, SUBSELECT_ITEM, ROW_ITEM, CACHE_ITEM}; @@ -663,7 +663,7 @@ public: Item_field((const char *)NULL, (const char *)NULL, (const char *)NULL), arg(NULL) {} Item_default_value(Item *a) : Item_field((const char *)NULL, (const char *)NULL, (const char *)NULL), arg(a) {} - enum Type type() const { return DEFAULT_ITEM; } + enum Type type() const { return DEFAULT_VALUE_ITEM; } bool eq(const Item *item, bool binary_cmp) const; bool fix_fields(THD *, struct st_table_list *, Item **); bool check_loop(uint id) @@ -682,12 +682,7 @@ public: } return Item_field::save_in_field(field, no_conversions); } - table_map used_tables() const - { - if (!arg) - return (table_map) 0L; - return Item_field::used_tables(); - } + table_map used_tables() const { return (table_map)0L; } }; class Item_cache: public Item |