diff options
| author | unknown <malff/marcsql@weblab.(none)> | 2007-03-01 20:08:58 -0700 |
|---|---|---|
| committer | unknown <malff/marcsql@weblab.(none)> | 2007-03-01 20:08:58 -0700 |
| commit | 133e08af14d8e28b484818a73ec8602e2cf09c0e (patch) | |
| tree | 8f5099dc6408d8e2e045e19bfa7fdcb70c1418e9 /sql | |
| parent | 09d82a1a9588bf0655ad0e43e76a2e1c28f336ca (diff) | |
| parent | 0a93be2869be5eb801d7955ad512504190dd0479 (diff) | |
| download | mariadb-git-133e08af14d8e28b484818a73ec8602e2cf09c0e.tar.gz | |
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into weblab.(none):/home/marcsql/TREE/mysql-5.0-26093
sql/item_func.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_func.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 0e454ad26a1..e41bf25e8e9 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -3459,6 +3459,7 @@ longlong Item_func_benchmark::val_int() DBUG_ASSERT(fixed == 1); char buff[MAX_FIELD_WIDTH]; String tmp(buff,sizeof(buff), &my_charset_bin); + my_decimal tmp_decimal; THD *thd=current_thd; for (ulong loop=0 ; loop < loop_count && !thd->killed; loop++) @@ -3473,6 +3474,9 @@ longlong Item_func_benchmark::val_int() case STRING_RESULT: (void) args[0]->val_str(&tmp); break; + case DECIMAL_RESULT: + (void) args[0]->val_decimal(&tmp_decimal); + break; case ROW_RESULT: default: // This case should never be chosen |