diff options
| author | unknown <evgen@moonbone.local> | 2007-06-03 16:06:55 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2007-06-03 16:06:55 +0400 |
| commit | 687191a0783408cb5f2ca44a81d6e6c89f755e17 (patch) | |
| tree | 20ca6dbe497dce42cebd5e4623271a320c38c24b /sql/item_func.h | |
| parent | 8b0afa63fb2d42bea3f992a57e8ebb883d914bee (diff) | |
| parent | e19dcfa91f63a7ff310a11a00ac670a04dfdd1fb (diff) | |
| download | mariadb-git-687191a0783408cb5f2ca44a81d6e6c89f755e17.tar.gz | |
Merge moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
into moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
mysql-test/r/user_var.result:
Auto merged
mysql-test/t/user_var.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 213e4298b39..7bb0ebfb1bf 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -1236,9 +1236,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); |