From 17a7debbe3944da83d7b080846ed1748d5238640 Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Sun, 6 Dec 2009 19:26:12 +0200 Subject: Changed -1 row number in some warnings to 0 (-1 doesn't make sence as a row number and when doing insert / load data, first row is 1, so 0 is free to use) mysql-test/r/warnings.result: Added test for warnings with row number mysql-test/suite/funcs_1/r/innodb_func_view.result: Updated test results mysql-test/suite/funcs_1/r/memory_func_view.result: Updated test results mysql-test/suite/funcs_1/r/myisam_func_view.result: Updated test results mysql-test/t/warnings.test: Added test for warnings with row numberAdded test for warnings with row number sql/my_decimal.cc: Don't use -1 as row number sql/share/errmsg.txt: Make row numbers unsigned --- sql/my_decimal.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sql/my_decimal.cc') diff --git a/sql/my_decimal.cc b/sql/my_decimal.cc index 208ddefb890..8b15ef4e586 100644 --- a/sql/my_decimal.cc +++ b/sql/my_decimal.cc @@ -38,7 +38,7 @@ int decimal_operation_results(int result) case E_DEC_TRUNCATED: push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED, ER(WARN_DATA_TRUNCATED), - "", (long)-1); + "", (ulong) 0); break; case E_DEC_OVERFLOW: push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR, @@ -54,7 +54,7 @@ int decimal_operation_results(int result) push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR, ER_TRUNCATED_WRONG_VALUE_FOR_FIELD, ER(ER_TRUNCATED_WRONG_VALUE_FOR_FIELD), - "decimal", "", "", (long)-1); + "decimal", "", "", (ulong) 0); break; case E_DEC_OOM: my_error(ER_OUT_OF_RESOURCES, MYF(0)); -- cgit v1.2.1