diff options
| author | monty@donna.mysql.fi <> | 2001-05-29 14:02:06 +0300 |
|---|---|---|
| committer | monty@donna.mysql.fi <> | 2001-05-29 14:02:06 +0300 |
| commit | acf598c50cb84b17d69c576d54e92c4244f0e778 (patch) | |
| tree | b19085fd0b08195acf9b2b681a1223bc7d0136d9 /sql/item_cmpfunc.cc | |
| parent | 444afa7597d4b4ae53719790b16039ccf73a314b (diff) | |
| parent | 3dc4b35a05846484a5adcda092dda7ae9cfecfd7 (diff) | |
| download | mariadb-git-acf598c50cb84b17d69c576d54e92c4244f0e778.tar.gz | |
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index e7a6c52dfd9..373aede7b6b 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -487,7 +487,7 @@ Item_func_if::fix_length_and_dec() { maybe_null=args[1]->maybe_null || args[2]->maybe_null; max_length=max(args[1]->max_length,args[2]->max_length); - decimals=max(args[0]->decimals,args[1]->decimals); + decimals=max(args[1]->decimals,args[2]->decimals); enum Item_result arg1_type=args[1]->result_type(); enum Item_result arg2_type=args[2]->result_type(); if (arg1_type == STRING_RESULT || arg2_type == STRING_RESULT) |