diff options
| author | unknown <monty@mishka.local> | 2004-10-05 01:10:23 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2004-10-05 01:10:23 +0300 |
| commit | 45a7c6581fa89f638d09e4063341d138679ce1f4 (patch) | |
| tree | 61d4fef7b2a5c71ac7fff85c77ebd1a8d090e8d1 /sql/share/english | |
| parent | faea84119ba2779ed76e91e44af0928919868442 (diff) | |
| parent | c7cf529f32b64447b389131eb61a6f8879eb4d82 (diff) | |
| download | mariadb-git-45a7c6581fa89f638d09e4063341d138679ce1f4.tar.gz | |
merge
mysql-test/r/sp.result:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/share/english')
| -rw-r--r-- | sql/share/english/errmsg.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt index 5d178008afc..1878d6e2da2 100644 --- a/sql/share/english/errmsg.txt +++ b/sql/share/english/errmsg.txt @@ -279,7 +279,7 @@ character-set=latin1 "%d line(s) were cut by GROUP_CONCAT()", "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", +"Column set to default value; NULL supplied to NOT NULL 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'", @@ -383,5 +383,6 @@ character-set=latin1 "Field '%-.64s' doesn't have a default value", "Division by 0", "Incorrect %-.32s value: '%-.128s' for column '%.64s' at row %ld", +"Illegal %s '%-.64s' value found during parsing", "CHECK OPTION on non-updatable view '%-.64s.%-.64s'" "CHECK OPTION failed '%-.64s.%-.64s'" |