diff options
author | unknown <monty@mishka.local> | 2004-09-28 20:08:00 +0300 |
---|---|---|
committer | unknown <monty@mishka.local> | 2004-09-28 20:08:00 +0300 |
commit | 2a49121590930ad9ef69718caad67304e94b9c00 (patch) | |
tree | 7f0311baaca32e6242f23dcf0a89ed38e39c9ac0 /sql/share | |
parent | e74b00bbc98c1082086422dc9c8578dade9d4a11 (diff) | |
download | mariadb-git-2a49121590930ad9ef69718caad67304e94b9c00.tar.gz |
Strict mode & better warnings
Under strict mode MySQL will generate an error message if there was any conversion when assigning data to a field.
Added checking of date/datetime fields.
If strict mode, give error if we have not given value to field without a default value (for INSERT)
client/mysqltest.c:
Added --exit as an option to abort a test in a middle (good for debugging)
include/my_time.h:
Added flags to allow checking of dates in strict mode
include/mysql_com.h:
Added flag to check if field has a default value or not
include/mysqld_error.h:
New error messages for strict mode
include/sql_state.h:
Fixed SQL states (for strict mode tests)
mysql-test/r/auto_increment.result:
Updated error messages
mysql-test/r/func_sapdb.result:
Added test for ALLOW_INVALID_DATES
mysql-test/r/func_str.result:
Updated error messages
mysql-test/r/func_time.result:
Updated error messages
mysql-test/r/insert.result:
Updated error messages
mysql-test/r/loaddata.result:
Updated error messages
mysql-test/r/select.result:
Updated error messages
mysql-test/r/sp.result:
Updated error messages
mysql-test/r/timezone2.result:
Updated error messages
mysql-test/r/type_datetime.result:
Updated error messages
mysql-test/r/type_decimal.result:
Updated error messages
mysql-test/r/type_float.result:
Updated error messages
mysql-test/r/type_ranges.result:
Updated error messages
mysql-test/r/type_time.result:
Updated error messages
mysql-test/r/type_uint.result:
Updated error messages
mysql-test/r/warnings.result:
Updated error messages
mysql-test/t/func_sapdb.test:
Aded test
sql-common/my_time.c:
Added checking of dates
sql/field.cc:
Better error messages
Optimization of warning handling (by introducing of check_int())
Changed to use my_strtoll10()
sql/field.h:
Added check_int()
sql/item_func.cc:
Warnings when dividing by NULL
sql/item_func.h:
Warnings when dividing by NULL
sql/item_timefunc.cc:
Testing of date/datetime
Use macros instead of constants
sql/mysql_priv.h:
New modes (part of strict mode)
sql/mysqld.cc:
New modes (part of strict mode)
sql/opt_range.cc:
Simple optimizations
sql/protocol.cc:
Add note/warning level to find_handler()
sql/set_var.cc:
Added mode 'traditional'
sql/share/czech/errmsg.txt:
New error messages for strict mode
sql/share/danish/errmsg.txt:
New error messages for strict mode
sql/share/dutch/errmsg.txt:
New error messages for strict mode
sql/share/english/errmsg.txt:
New error messages for strict mode
sql/share/estonian/errmsg.txt:
New error messages for strict mode
sql/share/french/errmsg.txt:
New error messages for strict mode
sql/share/german/errmsg.txt:
New error messages for strict mode
sql/share/greek/errmsg.txt:
New error messages for strict mode
sql/share/hungarian/errmsg.txt:
New error messages for strict mode
sql/share/italian/errmsg.txt:
New error messages for strict mode
sql/share/japanese/errmsg.txt:
New error messages for strict mode
sql/share/korean/errmsg.txt:
New error messages for strict mode
sql/share/norwegian-ny/errmsg.txt:
New error messages for strict mode
sql/share/norwegian/errmsg.txt:
New error messages for strict mode
sql/share/polish/errmsg.txt:
New error messages for strict mode
sql/share/portuguese/errmsg.txt:
New error messages for strict mode
sql/share/romanian/errmsg.txt:
New error messages for strict mode
sql/share/russian/errmsg.txt:
New error messages for strict mode
sql/share/serbian/errmsg.txt:
New error messages for strict mode
sql/share/slovak/errmsg.txt:
New error messages for strict mode
sql/share/spanish/errmsg.txt:
New error messages for strict mode
sql/share/swedish/errmsg.txt:
New error messages for strict mode
sql/share/ukrainian/errmsg.txt:
New error messages for strict mode
sql/sp_rcontext.cc:
Add note/warning level to find_handler()
sql/sp_rcontext.h:
Add note/warning level to find_handler()
sql/sql_base.cc:
Fix bug for detecting crashed table
sql/sql_class.cc:
Variables for strct mode
sql/sql_class.h:
Variables for strct mode
sql/sql_error.cc:
In strict mode, convert warnings to errors
sql/sql_insert.cc:
Strict mode
If strict mode, give error if we have not given value to field without a default value
sql/sql_load.cc:
Strict mode
sql/sql_parse.cc:
Strict mode.
Add flag to field if it doesn't have a default value
sql/sql_select.cc:
Added comment
Prepare for upper level handling of table->status
sql/sql_union.cc:
Added THD to write_record()
sql/sql_update.cc:
Strict mode
sql/table.cc:
Handling of default values
sql/time.cc:
Checking of dates
Diffstat (limited to 'sql/share')
-rw-r--r-- | sql/share/czech/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/danish/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/dutch/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/english/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/estonian/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/french/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/german/errmsg.txt | 3 | ||||
-rw-r--r-- | sql/share/greek/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/hungarian/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/italian/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/japanese/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/korean/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/norwegian-ny/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/norwegian/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/polish/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/portuguese/errmsg.txt | 3 | ||||
-rw-r--r-- | sql/share/romanian/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/russian/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/serbian/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/slovak/errmsg.txt | 5 | ||||
-rw-r--r-- | sql/share/spanish/errmsg.txt | 3 | ||||
-rw-r--r-- | sql/share/swedish/errmsg.txt | 3 | ||||
-rw-r--r-- | sql/share/ukrainian/errmsg.txt | 3 |
23 files changed, 87 insertions, 18 deletions
diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt index c613a22088a..7b24036d385 100644 --- a/sql/share/czech/errmsg.txt +++ b/sql/share/czech/errmsg.txt @@ -292,7 +292,7 @@ character-set=latin2 "Row %ld doesn't contain data for all columns", "Row %ld was truncated; it contained more data than there were input columns", "Data truncated; NULL supplied to NOT NULL column '%s' at row %ld", -"Data truncated; out of range for column '%s' at row %ld", +"Out of range value adjusted for column '%s' at row %ld", "Data truncated for column '%s' at row %ld", "Using storage engine %s for table '%s'", "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'", @@ -392,3 +392,6 @@ character-set=latin2 "Trigger's '%-.64s' is view or temporary table" "Updating of %s row is not allowed in %strigger" "There is no %s row in %s trigger" +"Field '%-.64s' doesn't have a default value", +"Division by 0", +"Incorrect %-.32s value: '%-.128s' for column '%.64s' at row %ld", diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt index 0f3a8f6ffdb..81a310a3f0a 100644 --- a/sql/share/danish/errmsg.txt +++ b/sql/share/danish/errmsg.txt @@ -283,7 +283,7 @@ character-set=latin1 "Row %ld doesn't contain data for all columns", "Row %ld was truncated; it contained more data than there were input columns", "Data truncated; NULL supplied to NOT NULL column '%s' at row %ld", -"Data truncated; out of range for column '%s' at row %ld", +"Out of range value adjusted for column '%s' at row %ld", "Data truncated for column '%s' at row %ld", "Using storage engine %s for table '%s'", "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'", @@ -383,3 +383,6 @@ character-set=latin1 "Trigger's '%-.64s' is view or temporary table" "Updating of %s row is not allowed in %strigger" "There is no %s row in %s trigger" +"Field '%-.64s' doesn't have a default value", +"Division by 0", +"Incorrect %-.32s value: '%-.128s' for column '%.64s' at row %ld", diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt index d0d86a07b7e..a67577b1c99 100644 --- a/sql/share/dutch/errmsg.txt +++ b/sql/share/dutch/errmsg.txt @@ -292,7 +292,7 @@ character-set=latin1 "Row %ld doesn't contain data for all columns", "Row %ld was truncated; it contained more data than there were input columns", "Data truncated; NULL supplied to NOT NULL column '%s' at row %ld", -"Data truncated; out of range for column '%s' at row %ld", +"Out of range value adjusted for column '%s' at row %ld", "Data truncated for column '%s' at row %ld", "Using storage engine %s for table '%s'", "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'", @@ -392,3 +392,6 @@ character-set=latin1 "Trigger's '%-.64s' is view or temporary table" "Updating of %s row is not allowed in %strigger" "There is no %s row in %s trigger" +"Field '%-.64s' doesn't have a default value", +"Division by 0", +"Incorrect %-.32s value: '%-.128s' for column '%.64s' at row %ld", diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt index 0b502244a64..e7f1d1b7f64 100644 --- a/sql/share/english/errmsg.txt +++ b/sql/share/english/errmsg.txt @@ -280,7 +280,7 @@ character-set=latin1 "Row %ld doesn't contain data for all columns", "Row %ld was truncated; it contained more data than there were input columns", "Data truncated; NULL supplied to NOT NULL column '%s' at row %ld", -"Data truncated; out of range for column '%s' at row %ld", +"Out of range value adjusted for column '%s' at row %ld", "Data truncated for column '%s' at row %ld", "Using storage engine %s for table '%s'", "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'", @@ -380,3 +380,6 @@ character-set=latin1 "Trigger's '%-.64s' is view or temporary table" "Updating of %s row is not allowed in %strigger" "There is no %s row in %s trigger" +"Field '%-.64s' doesn't have a default value", +"Division by 0", +"Incorrect %-.32s value: '%-.128s' for column '%.64s' at row %ld", diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt index 7886c785c40..b6058bc56fc 100644 --- a/sql/share/estonian/errmsg.txt +++ b/sql/share/estonian/errmsg.txt @@ -285,7 +285,7 @@ character-set=latin7 "Row %ld doesn't contain data for all columns", "Row %ld was truncated; it contained more data than there were input columns", "Data truncated; NULL supplied to NOT NULL column '%s' at row %ld", -"Data truncated; out of range for column '%s' at row %ld", +"Out of range value adjusted for column '%s' at row %ld", "Data truncated for column '%s' at row %ld", "Using storage engine %s for table '%s'", "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'", @@ -385,3 +385,6 @@ character-set=latin7 "Trigger's '%-.64s' is view or temporary table" "Updating of %s row is not allowed in %strigger" "There is no %s row in %s trigger" +"Field '%-.64s' doesn't have a default value", +"Division by 0", +"Incorrect %-.32s value: '%-.128s' for column '%.64s' at row %ld", diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt index 9668cbf3c9f..345d20e2203 100644 --- a/sql/share/french/errmsg.txt +++ b/sql/share/french/errmsg.txt @@ -280,7 +280,7 @@ character-set=latin1 "Row %ld doesn't contain data for all columns", "Row %ld was truncated; it contained more data than there were input columns", "Data truncated; NULL supplied to NOT NULL column '%s' at row %ld", -"Data truncated; out of range for column '%s' at row %ld", +"Out of range value adjusted for column '%s' at row %ld", "Data truncated for column '%s' at row %ld", "Using storage engine %s for table '%s'", "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'", @@ -380,3 +380,6 @@ character-set=latin1 "Trigger's '%-.64s' is view or temporary table" "Updating of %s row is not allowed in %strigger" "There is no %s row in %s trigger" +"Field '%-.64s' doesn't have a default value", +"Division by 0", +"Incorrect %-.32s value: '%-.128s' for column '%.64s' at row %ld", diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt index c2c82443f91..ccc69c68683 100644 --- a/sql/share/german/errmsg.txt +++ b/sql/share/german/errmsg.txt @@ -393,3 +393,6 @@ character-set=latin1 "Trigger's '%-.64s' is view or temporary table" "Updating of %s row is not allowed in %strigger" "There is no %s row in %s trigger" +"Field '%-.64s' doesn't have a default value", +"Division by 0", +"Incorrect %-.32s value: '%-.128s' for column '%.64s' at row %ld", diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt index 3aac21ec481..edd4e07c4d0 100644 --- a/sql/share/greek/errmsg.txt +++ b/sql/share/greek/errmsg.txt @@ -280,7 +280,7 @@ character-set=greek "Row %ld doesn't contain data for all columns", "Row %ld was truncated; it contained more data than there were input columns", "Data truncated; NULL supplied to NOT NULL column '%s' at row %ld", -"Data truncated; out of range for column '%s' at row %ld", +"Out of range value adjusted for column '%s' at row %ld", "Data truncated for column '%s' at row %ld", "Using storage engine %s for table '%s'", "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'", @@ -380,3 +380,6 @@ character-set=greek "Trigger's '%-.64s' is view or temporary table" "Updating of %s row is not allowed in %strigger" "There is no %s row in %s trigger" +"Field '%-.64s' doesn't have a default value", +"Division by 0", +"Incorrect %-.32s value: '%-.128s' for column '%.64s' at row %ld", diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt index 8f96a0bf183..27c51b3ce2b 100644 --- a/sql/share/hungarian/errmsg.txt +++ b/sql/share/hungarian/errmsg.txt @@ -285,7 +285,7 @@ character-set=latin2 "Row %ld doesn't contain data for all columns", "Row %ld was truncated; it contained more data than there were input columns", "Data truncated; NULL supplied to NOT NULL column '%s' at row %ld", -"Data truncated; out of range for column '%s' at row %ld", +"Out of range value adjusted for column '%s' at row %ld", "Data truncated for column '%s' at row %ld", "Using storage engine %s for table '%s'", "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'", @@ -385,3 +385,6 @@ character-set=latin2 "Trigger's '%-.64s' is view or temporary table" "Updating of %s row is not allowed in %strigger" "There is no %s row in %s trigger" +"Field '%-.64s' doesn't have a default value", +"Division by 0", +"Incorrect %-.32s value: '%-.128s' for column '%.64s' at row %ld", diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt index 8d63656bac2..40e1271b187 100644 --- a/sql/share/italian/errmsg.txt +++ b/sql/share/italian/errmsg.txt @@ -280,7 +280,7 @@ character-set=latin1 "Row %ld doesn't contain data for all columns", "Row %ld was truncated; it contained more data than there were input columns", "Data truncated; NULL supplied to NOT NULL column '%s' at row %ld", -"Data truncated; out of range for column '%s' at row %ld", +"Out of range value adjusted for column '%s' at row %ld", "Data truncated for column '%s' at row %ld", "Using storage engine %s for table '%s'", "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'", @@ -380,3 +380,6 @@ character-set=latin1 "Trigger's '%-.64s' is view or temporary table" "Updating of %s row is not allowed in %strigger" "There is no %s row in %s trigger" +"Field '%-.64s' doesn't have a default value", +"Division by 0", +"Incorrect %-.32s value: '%-.128s' for column '%.64s' at row %ld", diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt index 30eb8daffa4..67de9337ff5 100644 --- a/sql/share/japanese/errmsg.txt +++ b/sql/share/japanese/errmsg.txt @@ -284,7 +284,7 @@ character-set=ujis "Row %ld doesn't contain data for all columns", "Row %ld was truncated; it contained more data than there were input columns", "Data truncated; NULL supplied to NOT NULL column '%s' at row %ld", -"Data truncated; out of range for column '%s' at row %ld", +"Out of range value adjusted for column '%s' at row %ld", "Data truncated for column '%s' at row %ld", "Using storage engine %s for table '%s'", "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'", @@ -384,3 +384,6 @@ character-set=ujis "Trigger's '%-.64s' is view or temporary table" "Updating of %s row is not allowed in %strigger" "There is no %s row in %s trigger" +"Field '%-.64s' doesn't have a default value", +"Division by 0", +"Incorrect %-.32s value: '%-.128s' for column '%.64s' at row %ld", diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt index dac28683a78..e2d4e29ede7 100644 --- a/sql/share/korean/errmsg.txt +++ b/sql/share/korean/errmsg.txt @@ -280,7 +280,7 @@ character-set=euckr "Row %ld doesn't contain data for all columns", "Row %ld was truncated; it contained more data than there were input columns", "Data truncated; NULL supplied to NOT NULL column '%s' at row %ld", -"Data truncated; out of range for column '%s' at row %ld", +"Out of range value adjusted for column '%s' at row %ld", "Data truncated for column '%s' at row %ld", "Using storage engine %s for table '%s'", "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'", @@ -380,3 +380,6 @@ character-set=euckr "Trigger's '%-.64s' is view or temporary table" "Updating of %s row is not allowed in %strigger" "There is no %s row in %s trigger" +"Field '%-.64s' doesn't have a default value", +"Division by 0", +"Incorrect %-.32s value: '%-.128s' for column '%.64s' at row %ld", diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt index 58661f16bcf..a8bc6129db9 100644 --- a/sql/share/norwegian-ny/errmsg.txt +++ b/sql/share/norwegian-ny/errmsg.txt @@ -282,7 +282,7 @@ character-set=latin1 "Row %ld doesn't contain data for all columns", "Row %ld was truncated; it contained more data than there were input columns", "Data truncated; NULL supplied to NOT NULL column '%s' at row %ld", -"Data truncated; out of range for column '%s' at row %ld", +"Out of range value adjusted for column '%s' at row %ld", "Data truncated for column '%s' at row %ld", "Using storage engine %s for table '%s'", "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'", @@ -382,3 +382,6 @@ character-set=latin1 "Trigger's '%-.64s' is view or temporary table" "Updating of %s row is not allowed in %strigger" "There is no %s row in %s trigger" +"Field '%-.64s' doesn't have a default value", +"Division by 0", +"Incorrect %-.32s value: '%-.128s' for column '%.64s' at row %ld", diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt index ea204145d54..ddf6960c740 100644 --- a/sql/share/norwegian/errmsg.txt +++ b/sql/share/norwegian/errmsg.txt @@ -282,7 +282,7 @@ character-set=latin1 "Row %ld doesn't contain data for all columns", "Row %ld was truncated; it contained more data than there were input columns", "Data truncated; NULL supplied to NOT NULL column '%s' at row %ld", -"Data truncated; out of range for column '%s' at row %ld", +"Out of range value adjusted for column '%s' at row %ld", "Data truncated for column '%s' at row %ld", "Using storage engine %s for table '%s'", "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'", @@ -382,3 +382,6 @@ character-set=latin1 "Trigger's '%-.64s' is view or temporary table" "Updating of %s row is not allowed in %strigger" "There is no %s row in %s trigger" +"Field '%-.64s' doesn't have a default value", +"Division by 0", +"Incorrect %-.32s value: '%-.128s' for column '%.64s' at row %ld", diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt index db0d4914c19..5a871fbf776 100644 --- a/sql/share/polish/errmsg.txt +++ b/sql/share/polish/errmsg.txt @@ -285,7 +285,7 @@ character-set=latin2 "Row %ld doesn't contain data for all columns", "Row %ld was truncated; it contained more data than there were input columns", "Data truncated; NULL supplied to NOT NULL column '%s' at row %ld", -"Data truncated; out of range for column '%s' at row %ld", +"Out of range value adjusted for column '%s' at row %ld", "Data truncated for column '%s' at row %ld", "Using storage engine %s for table '%s'", "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'", @@ -385,3 +385,6 @@ character-set=latin2 "Trigger's '%-.64s' is view or temporary table" "Updating of %s row is not allowed in %strigger" "There is no %s row in %s trigger" +"Field '%-.64s' doesn't have a default value", +"Division by 0", +"Incorrect %-.32s value: '%-.128s' for column '%.64s' at row %ld", diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt index d3508f120db..c0861879702 100644 --- a/sql/share/portuguese/errmsg.txt +++ b/sql/share/portuguese/errmsg.txt @@ -382,3 +382,6 @@ character-set=latin1 "Trigger's '%-.64s' is view or temporary table" "Updating of %s row is not allowed in %strigger" "There is no %s row in %s trigger" +"Field '%-.64s' doesn't have a default value", +"Division by 0", +"Incorrect %-.32s value: '%-.128s' for column '%.64s' at row %ld", diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt index 65ab66e1256..60c3cb4245d 100644 --- a/sql/share/romanian/errmsg.txt +++ b/sql/share/romanian/errmsg.txt @@ -285,7 +285,7 @@ character-set=latin2 "Row %ld doesn't contain data for all columns", "Row %ld was truncated; it contained more data than there were input columns", "Data truncated; NULL supplied to NOT NULL column '%s' at row %ld", -"Data truncated; out of range for column '%s' at row %ld", +"Out of range value adjusted for column '%s' at row %ld", "Data truncated for column '%s' at row %ld", "Using storage engine %s for table '%s'", "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'", @@ -385,3 +385,6 @@ character-set=latin2 "Trigger's '%-.64s' is view or temporary table" "Updating of %s row is not allowed in %strigger" "There is no %s row in %s trigger" +"Field '%-.64s' doesn't have a default value", +"Division by 0", +"Incorrect %-.32s value: '%-.128s' for column '%.64s' at row %ld", diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt index 6501598383c..e62c5a84a44 100644 --- a/sql/share/russian/errmsg.txt +++ b/sql/share/russian/errmsg.txt @@ -285,7 +285,7 @@ character-set=koi8r "Row %ld doesn't contain data for all columns", "Row %ld was truncated; it contained more data than there were input columns", "Data truncated; NULL supplied to NOT NULL column '%s' at row %ld", -"Data truncated; out of range for column '%s' at row %ld", +"Out of range value adjusted for column '%s' at row %ld", "Data truncated for column '%s' at row %ld", "Using storage engine %s for table '%s'", "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'", @@ -385,3 +385,6 @@ character-set=koi8r "Trigger's '%-.64s' is view or temporary table" "Updating of %s row is not allowed in %strigger" "There is no %s row in %s trigger" +"Field '%-.64s' doesn't have a default value", +"Division by 0", +"Incorrect %-.32s value: '%-.128s' for column '%.64s' at row %ld", diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt index 6e7826e33d6..2c366890653 100644 --- a/sql/share/serbian/errmsg.txt +++ b/sql/share/serbian/errmsg.txt @@ -273,7 +273,7 @@ character-set=cp1250 "Row %ld doesn't contain data for all columns", "Row %ld was truncated; it contained more data than there were input columns", "Data truncated; NULL supplied to NOT NULL column '%s' at row %ld", -"Data truncated; out of range for column '%s' at row %ld", +"Out of range value adjusted for column '%s' at row %ld", "Data truncated for column '%s' at row %ld", "Using storage engine %s for table '%s'", "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'", @@ -373,3 +373,6 @@ character-set=cp1250 "Trigger's '%-.64s' is view or temporary table" "Updating of %s row is not allowed in %strigger" "There is no %s row in %s trigger" +"Field '%-.64s' doesn't have a default value", +"Division by 0", +"Incorrect %-.32s value: '%-.128s' for column '%.64s' at row %ld", diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt index 4c82ae5e3af..12eacb82dac 100644 --- a/sql/share/slovak/errmsg.txt +++ b/sql/share/slovak/errmsg.txt @@ -288,7 +288,7 @@ character-set=latin2 "Row %ld doesn't contain data for all columns", "Row %ld was truncated; it contained more data than there were input columns", "Data truncated; NULL supplied to NOT NULL column '%s' at row %ld", -"Data truncated; out of range for column '%s' at row %ld", +"Out of range value adjusted for column '%s' at row %ld", "Data truncated for column '%s' at row %ld", "Using storage engine %s for table '%s'", "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'", @@ -388,3 +388,6 @@ character-set=latin2 "Trigger's '%-.64s' is view or temporary table" "Updating of %s row is not allowed in %strigger" "There is no %s row in %s trigger" +"Field '%-.64s' doesn't have a default value", +"Division by 0", +"Incorrect %-.32s value: '%-.128s' for column '%.64s' at row %ld", diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt index c9a1d7229ea..94b180914fe 100644 --- a/sql/share/spanish/errmsg.txt +++ b/sql/share/spanish/errmsg.txt @@ -384,3 +384,6 @@ character-set=latin1 "Trigger's '%-.64s' is view or temporary table" "Updating of %s row is not allowed in %strigger" "There is no %s row in %s trigger" +"Field '%-.64s' doesn't have a default value", +"Division by 0", +"Incorrect %-.32s value: '%-.128s' for column '%.64s' at row %ld", diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt index e80cb48d157..718db694494 100644 --- a/sql/share/swedish/errmsg.txt +++ b/sql/share/swedish/errmsg.txt @@ -380,3 +380,6 @@ character-set=latin1 "Trigger's '%-.64s' is view or temporary table" "Updating of %s row is not allowed in %strigger" "There is no %s row in %s trigger" +"Field '%-.64s' doesn't have a default value", +"Division by 0", +"Incorrect %-.32s value: '%-.128s' for column '%.64s' at row %ld", diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt index 2a71aa088f4..7a4c37abd1d 100644 --- a/sql/share/ukrainian/errmsg.txt +++ b/sql/share/ukrainian/errmsg.txt @@ -386,3 +386,6 @@ character-set=koi8u "Trigger's '%-.64s' is view or temporary table" "Updating of %s row is not allowed in %strigger" "There is no %s row in %s trigger" +"Field '%-.64s' doesn't have a default value", +"Division by 0", +"Incorrect %-.32s value: '%-.128s' for column '%.64s' at row %ld", |