summaryrefslogtreecommitdiff
path: root/sql/share/errmsg.txt
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2005-03-30 16:00:31 +0300
committerunknown <monty@mysql.com>2005-03-30 16:00:31 +0300
commit927a31149bc9a98b57fae8db98ec9d984d8c5656 (patch)
tree805fffb7b7262d7e59f1fd8969a0c1670de80a88 /sql/share/errmsg.txt
parent4fbf3f417b3c61782ea8ceed9ec202b7a2dfd864 (diff)
downloadmariadb-git-927a31149bc9a98b57fae8db98ec9d984d8c5656.tar.gz
Give warnings if wrong date/time/datetime argument for STR_TO_DATE
Small fixes while doing review of new pushed code More test cases for decimal mysql-test/r/date_formats.result: Warnings added for STR_TO_DATE() mysql-test/r/ps_1general.result: Better description for BLACKHOLE mysql-test/r/strict.result: Added tests for STR_TO_DATE mysql-test/r/type_decimal.result: Test to test ranges of DECIMAL mysql-test/t/date_formats.test: More tests mysql-test/t/strict.test: Added tests for STR_TO_DATE mysql-test/t/type_decimal.test: Test to test ranges of DECIMAL sql/field.cc: Simple optimization sql/handler.cc: Better description for BLACKHOLE sql/item_timefunc.cc: Give warnings if wrong date/time/datetime argument for STR_TO_DATE sql/log_event.cc: Indentation fixes sql/log_event.h: #ifdef-ed not used code sql/share/errmsg.txt: New error message sql/sql_show.cc: Ensure that we do a proper restore in case of error
Diffstat (limited to 'sql/share/errmsg.txt')
-rw-r--r--sql/share/errmsg.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index 6b254f47284..82e9bbc1c68 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -5334,3 +5334,5 @@ ER_LOAD_FROM_FIXED_SIZE_ROWS_TO_VAR
eng "Can't load value from file with fixed size rows to variable"
ER_CANT_CREATE_USER_WITH_GRANT 42000
eng "You are not allowed to create a user with GRANT"
+ER_WRONG_VALUE_FOR_TYPE
+ eng "Incorrect %-.32s value: '%-.128s' for function %-.32s"