diff options
| author | unknown <hf@deer.(none)> | 2005-09-26 13:15:01 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2005-09-26 13:15:01 +0500 |
| commit | f6b2b7a49714391a3fbb26f6d08ecb3c61e36250 (patch) | |
| tree | 2d8b3a9fbe5a85cf114607e4607cf236ed9192b9 /sql/share | |
| parent | ddd18a89ad93929b4f57d78af7c8a92892ebfba3 (diff) | |
| parent | eaba3ed347999af4c31c4419b6bf89e40c041caa (diff) | |
| download | mariadb-git-f6b2b7a49714391a3fbb26f6d08ecb3c61e36250.tar.gz | |
Merging
sql/sql_parse.cc:
Auto 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 c9b717211ce..f2a91d5b88b 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5419,3 +5419,5 @@ ER_ROW_IS_REFERENCED_2 23000 eng "Cannot delete or update a parent row: a foreign key constraint fails (%.192s)" ER_NO_REFERENCED_ROW_2 23000 eng "Cannot add or update a child row: a foreign key constraint fails (%.192s)" +ER_M_BIGGER_THAN_D 42000 S1009 + eng "For float(M,D) or double(M,D), M must be >= D (column '%-.64s')." |