diff options
author | unknown <jimw@mysql.com> | 2005-08-15 12:38:56 -0700 |
---|---|---|
committer | unknown <jimw@mysql.com> | 2005-08-15 12:38:56 -0700 |
commit | 163b04c3fa527390ceec79563520f267aa0b131b (patch) | |
tree | 670cc17fc21ae1d30d67b4442156847ad0e55b0d /sql/share | |
parent | f6de082b08f07a705a5a701017b8a160adb02fc6 (diff) | |
parent | 455ee425d146f876085c8fe8db0be2f4124640f8 (diff) | |
download | mariadb-git-163b04c3fa527390ceec79563520f267aa0b131b.tar.gz |
Merge mysql.com:/home/jimw/my/mysql-5.0-10627
into mysql.com:/home/jimw/my/mysql-5.0-clean
sql/share/errmsg.txt:
SCCS merged
Diffstat (limited to 'sql/share')
-rw-r--r-- | sql/share/errmsg.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 25f26fee487..2c28eef1ea1 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5395,3 +5395,5 @@ ER_TOO_BIG_DISPLAYWIDTH 42000 S1009 eng "Display width out of range for column '%-.64s' (max = %d)" ER_XAER_DUPID XAE08 eng "XAER_DUPID: The XID already exists" +ER_DATETIME_FUNCTION_OVERFLOW 22008 + eng "Datetime function: %-.32s field overflow" |