diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-08-15 15:48:57 -0600 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-08-15 15:48:57 -0600 |
| commit | 0a494e937b3ea473990cc0aabec8ddc7c8329e90 (patch) | |
| tree | 992a8edd504f9a67e4f9653773ae3905e0b00aa6 /sql/share | |
| parent | 2adb4942e4be292a94db8083731f7534f7d0962b (diff) | |
| parent | 9d819b7d7f748b41e137b1eb94495156041a2593 (diff) | |
| download | mariadb-git-0a494e937b3ea473990cc0aabec8ddc7c8329e90.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
mysql-test/r/innodb.result:
Auto merged
sql/sql_table.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 966e841ccbf..8ecba1d4be0 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5654,6 +5654,8 @@ ER_NON_INSERTABLE_TABLE ger "Die Zieltabelle %-.100s von %s ist nicht einfügbar" ER_ADMIN_WRONG_MRG_TABLE eng "Table '%-.64s' is differently defined or of non-MyISAM type or doesn't exist" +ER_TOO_HIGH_LEVEL_OF_NESTING_FOR_SELECT + eng "Too high level of nesting for select" ER_FOREIGN_SERVER_EXISTS eng "The foreign server, %s, you are trying to create already exists." ER_FOREIGN_SERVER_DOESNT_EXIST |