diff options
| author | gluh@eagle.(none) <> | 2007-11-14 17:30:16 +0400 |
|---|---|---|
| committer | gluh@eagle.(none) <> | 2007-11-14 17:30:16 +0400 |
| commit | 58336411c9d624f0e99cf95aa5db22ec70dd0c6c (patch) | |
| tree | 4676d6947f9f56056b0b29957c90cba5cdad5eba /sql/share | |
| parent | 6223deb694946e5a2c3e46eaf4f2ce5624b5e78a (diff) | |
| parent | 95e7cccfee7f1b1df3e455fb5e6bc10ef49c2a3a (diff) | |
| download | mariadb-git-58336411c9d624f0e99cf95aa5db22ec70dd0c6c.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
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 257cea7c27b..02e20ad7c5c 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5658,6 +5658,8 @@ ER_TOO_HIGH_LEVEL_OF_NESTING_FOR_SELECT eng "Too high level of nesting for select" ER_NAME_BECOMES_EMPTY eng "Name '%-.64s' has become ''" +ER_AMBIGUOUS_FIELD_TERM + eng "First character of the FIELDS TERMINATED string is ambiguous; please use non-optional and non-empty FIELDS ENCLOSED BY" ER_FOREIGN_SERVER_EXISTS eng "The foreign server, %s, you are trying to create already exists." ER_FOREIGN_SERVER_DOESNT_EXIST |