diff options
| author | unknown <monty@mishka.local> | 2005-05-06 13:51:58 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2005-05-06 13:51:58 +0300 |
| commit | f43c58178159aeef3a5aea22390238aeb9b1e772 (patch) | |
| tree | 4ae68ee5fcd5cdd54cefba299cab2ccb0e57f806 /sql/item_cmpfunc.cc | |
| parent | 0b2ae60c6220b01411a293c5a439605b2672a50b (diff) | |
| parent | ab54e167052bb03f7f25cb071ee75f4f26caf68f (diff) | |
| download | mariadb-git-f43c58178159aeef3a5aea22390238aeb9b1e772.tar.gz | |
merge
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/key.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/unireg.cc:
Auto merged
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 8c44972e469..89897a9d74f 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -1737,8 +1737,7 @@ my_decimal *Item_func_coalesce::val_decimal(my_decimal *decimal_value) void Item_func_coalesce::fix_length_and_dec() { agg_result_type(&cached_result_type, args, arg_count); - switch (cached_result_type) - { + switch (cached_result_type) { case STRING_RESULT: count_only_length(); decimals= NOT_FIXED_DEC; |