diff options
| author | unknown <igor@olga.mysql.com> | 2007-06-03 07:58:07 -0700 |
|---|---|---|
| committer | unknown <igor@olga.mysql.com> | 2007-06-03 07:58:07 -0700 |
| commit | 7b8af0f55551be559443b83c26d634675e614b4c (patch) | |
| tree | 528a49b111a76ef64d22be1a4e45680f7cad8099 /sql | |
| parent | 6c403ec92090029d7525e03f6e8ad120e99ff1f8 (diff) | |
| parent | eb958affe32a984433b49058881a288d63805465 (diff) | |
| download | mariadb-git-7b8af0f55551be559443b83c26d634675e614b4c.tar.gz | |
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_func.cc | 4 | ||||
| -rw-r--r-- | sql/item_func.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index ca8b0af865d..580d19fbd4e 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -4208,7 +4208,7 @@ my_decimal *Item_func_set_user_var::val_decimal(my_decimal *val) } -double Item_func_set_user_var::val_real_result() +double Item_func_set_user_var::val_result() { DBUG_ASSERT(fixed == 1); check(TRUE); @@ -4224,7 +4224,7 @@ longlong Item_func_set_user_var::val_int_result() return entry->val_int(&null_value); } -String *Item_func_set_user_var::val_str_result(String *str) +String *Item_func_set_user_var::str_result(String *str) { DBUG_ASSERT(fixed == 1); check(TRUE); diff --git a/sql/item_func.h b/sql/item_func.h index c8ea79b9747..9a0201cb28b 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -1208,9 +1208,9 @@ public: longlong val_int(); String *val_str(String *str); my_decimal *val_decimal(my_decimal *); - double val_real_result(); + double val_result(); longlong val_int_result(); - String *val_str_result(String *str); + String *str_result(String *str); my_decimal *val_decimal_result(my_decimal *); bool update_hash(void *ptr, uint length, enum Item_result type, CHARSET_INFO *cs, Derivation dv, bool unsigned_arg); |