diff options
| author | patg@govinda.patg.net <> | 2006-12-08 22:30:18 -0500 |
|---|---|---|
| committer | patg@govinda.patg.net <> | 2006-12-08 22:30:18 -0500 |
| commit | f9097b86af657717280061400cbdec97f4a5fa65 (patch) | |
| tree | d4e2024ed0a048aebabc053293f04f67c25d5a55 /sql/share | |
| parent | 23f0c6d7658de7a5c465d7afb66ae2f87d8ea96a (diff) | |
| parent | 98062f567d31516f61d720661f46ee447d66821d (diff) | |
| download | mariadb-git-f9097b86af657717280061400cbdec97f4a5fa65.tar.gz | |
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
into govinda.patg.net:/home/patg/mysql-build/mysql-5.1-arch-wl3031-merge
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index c64f4da045e..1b9e1aa96ec 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5607,6 +5607,8 @@ ER_SP_RECURSION_LIMIT ER_SP_PROC_TABLE_CORRUPT eng "Failed to load routine %-.64s. The table mysql.proc is missing, corrupt, or contains bad data (internal code %d)" ger "Routine %-64s konnte nicht geladen werden. Die Tabelle mysql.proc fehlt, ist beschädigt, oder enthält fehlerhaften Daten (interner Code: %d)" +ER_FOREIGN_SERVER_EXISTS + eng "The foreign server, %s, you are trying to create already exists." ER_SP_WRONG_NAME 42000 eng "Incorrect routine name '%-.64s'" ger "Ungültiger Routinenname '%-.64s'" @@ -5847,6 +5849,9 @@ ER_BINLOG_ROW_WRONG_TABLE_DEF ER_BINLOG_ROW_RBR_TO_SBR eng "Slave running with --log-slave-updates must use row-based binary logging to be able to replicate row-based binary log events" ger "Slave, die mit --log-slave-updates laufen, müssen zeilenbasiertes Loggen verwenden, um zeilenbasierte Binärlog-Ereignisse loggen zu können" +ER_FOREIGN_SERVER_DOESNT_EXIST + eng "The foreign server name you are trying to reference does not exist. Data source error: %-.64s" + ger "Die externe Verbindung, auf die Sie zugreifen wollen, existiert nicht. Datenquellenfehlermeldung: %-.64s" ER_EVENT_ALREADY_EXISTS eng "Event '%-.64s' already exists" ger "Event '%-.64s' existiert bereits" |