diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-03-27 10:03:28 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-03-27 10:03:28 +0100 |
| commit | 6599fd3e9c23a8957a63146cbe6a0ffc4c292a3d (patch) | |
| tree | 5a7e05e0a9abb5f5cc2672bc3d545ac3f5f7fa43 /sql/item_func.cc | |
| parent | 102a7a2a763dc5f2da8dd1f9ca9a53664c5aad6a (diff) | |
| parent | e308d7417bc4ceb1b3b72cac2642015b88f310ff (diff) | |
| download | mariadb-git-6599fd3e9c23a8957a63146cbe6a0ffc4c292a3d.tar.gz | |
5.3 merge
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 2bc1cdba326..84161021a2b 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -769,13 +769,14 @@ void Item_num_op::find_num_type(void) { hybrid_type= DECIMAL_RESULT; result_precision(); + fix_decimals(); } else { DBUG_ASSERT(r0 == INT_RESULT && r1 == INT_RESULT); - decimals= 0; hybrid_type=INT_RESULT; result_precision(); + decimals= 0; } DBUG_PRINT("info", ("Type: %s", (hybrid_type == REAL_RESULT ? "REAL_RESULT" : @@ -1708,6 +1709,7 @@ void Item_func_div::fix_length_and_dec() break; case DECIMAL_RESULT: result_precision(); + fix_decimals(); break; case STRING_RESULT: case ROW_RESULT: |