diff options
| author | unknown <kaa@polly.local> | 2007-04-28 20:04:03 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2007-04-28 20:04:03 +0400 |
| commit | 59a35c9afcdcf9dd9cd9f127dcd417ac7dc0e2c1 (patch) | |
| tree | c87d798baa97ec3d7f94149623cfb252e838756e /sql/item_func.h | |
| parent | 272563d81bfd3a736aaf7cabc5bd7e2587adbe47 (diff) | |
| parent | 38090df9b566da89942f8a90fe71a3fac31efb9d (diff) | |
| download | mariadb-git-59a35c9afcdcf9dd9cd9f127dcd417ac7dc0e2c1.tar.gz | |
Merge polly.local:/home/kaa/src/maint/bug24912/my50-bug24912
into polly.local:/home/kaa/src/maint/bug24912/my51-bug24912
mysql-test/r/type_newdecimal.result:
Auto merged
mysql-test/t/func_math.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/mysql_priv.h:
Auto merged
mysql-test/r/func_math.result:
Manual merge.
sql/item_strfunc.cc:
Manual merge.
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 3306b059097..f1e3295481c 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -280,7 +280,7 @@ public: { max_length= 21; } Item_int_func(List<Item> &list) :Item_func(list) { max_length= 21; } Item_int_func(THD *thd, Item_int_func *item) :Item_func(thd, item) {} - double val_real() { DBUG_ASSERT(fixed == 1); return (double) val_int(); } + double val_real(); String *val_str(String*str); enum Item_result result_type () const { return INT_RESULT; } void fix_length_and_dec() {} @@ -305,12 +305,6 @@ class Item_func_signed :public Item_int_func public: Item_func_signed(Item *a) :Item_int_func(a) {} const char *func_name() const { return "cast_as_signed"; } - double val_real() - { - double tmp= args[0]->val_real(); - null_value= args[0]->null_value; - return tmp; - } longlong val_int(); longlong val_int_from_str(int *error); void fix_length_and_dec() |