diff options
| author | unknown <kaa@polly.local> | 2007-05-31 12:21:21 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2007-05-31 12:21:21 +0400 |
| commit | 2c9f2ebb60cc0249f0e450690200789b8007a2b9 (patch) | |
| tree | a7698a5fcf1383f3c9914828149de5042efc2417 /sql/item_cmpfunc.cc | |
| parent | a7490c4da833da6a9034d62796d1f64f197e028f (diff) | |
| parent | 9dc7a7b8344335b03a2162abcc7c1a61fa21fc1d (diff) | |
| download | mariadb-git-2c9f2ebb60cc0249f0e450690200789b8007a2b9.tar.gz | |
Merge polly.local:/home/kaa/src/maint/bug28121/my50-bug28121
into polly.local:/home/kaa/src/maint/bug28121/my51-bug28121
include/m_string.h:
Auto merged
sql/item_cmpfunc.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 08908f51c58..9ce0ed1d22e 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -560,7 +560,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) + 1]; + precision= 5 / log_10[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) |