diff options
| author | unknown <holyfoot@hf-ibm.(none)> | 2005-05-06 19:04:58 +0500 |
|---|---|---|
| committer | unknown <holyfoot@hf-ibm.(none)> | 2005-05-06 19:04:58 +0500 |
| commit | f1def25a89e3dc2ed191335e9d5f7843de245e0a (patch) | |
| tree | 9567d00a7dd4b1a7be9aa7f2d48b28753a9c1a52 /sql/my_decimal.cc | |
| parent | 0430cdb7c51155de834f7e1268a862d5dd1a0210 (diff) | |
| download | mariadb-git-f1def25a89e3dc2ed191335e9d5f7843de245e0a.tar.gz | |
Trimmed fix for bug #9546 (Crashing with huge decimals)
mysql-test/r/type_newdecimal.result:
test result fixed
mysql-test/t/type_newdecimal.test:
test case added
sql/my_decimal.cc:
error message fixed
strings/decimal.c:
do_add function fixed
Diffstat (limited to 'sql/my_decimal.cc')
| -rw-r--r-- | sql/my_decimal.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/my_decimal.cc b/sql/my_decimal.cc index 14c15cdc4ef..f188d27ff78 100644 --- a/sql/my_decimal.cc +++ b/sql/my_decimal.cc @@ -43,9 +43,9 @@ int decimal_operation_results(int result) break; case E_DEC_OVERFLOW: push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR, - ER_WARN_DATA_OUT_OF_RANGE, - ER(ER_WARN_DATA_OUT_OF_RANGE), - "", (long)-1); + ER_TRUNCATED_WRONG_VALUE, + ER(ER_TRUNCATED_WRONG_VALUE), + "DECIMAL", ""); break; case E_DEC_DIV_ZERO: push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR, |