diff options
| author | unknown <kaa@polly.local> | 2007-05-28 14:34:36 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2007-05-28 14:34:36 +0400 |
| commit | 8358a0c7c7915d0cc2913833e600f2e591deaab5 (patch) | |
| tree | c780426e0fed8b2fd935748019138980d2623538 /sql/item_cmpfunc.cc | |
| parent | de108e05f9b7204ce572527765952c29b5fde289 (diff) | |
| parent | e3af3c2127132e327ea8dd21d942ef2e09d7f4d6 (diff) | |
| download | mariadb-git-8358a0c7c7915d0cc2913833e600f2e591deaab5.tar.gz | |
Merge polly.local:/home/kaa/src/maint/bug28121/my50-bug28121
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
strings/strtod.c:
Auto merged
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 0de9ef3e9ad..59af6f0fec7 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -507,7 +507,7 @@ int Arg_comparator::set_compare_func(Item_bool_func2 *item, Item_result type) { if ((*a)->decimals < NOT_FIXED_DEC && (*b)->decimals < NOT_FIXED_DEC) { - precision= 5 * log_01[max((*a)->decimals, (*b)->decimals)]; + precision= 5 * log_01[max((*a)->decimals, (*b)->decimals) + 1]; if (func == &Arg_comparator::compare_real) func= &Arg_comparator::compare_real_fixed; else if (func == &Arg_comparator::compare_e_real) |