diff options
| author | mats@kindahl-laptop.dnsalias.net <> | 2007-06-09 08:29:51 +0200 |
|---|---|---|
| committer | mats@kindahl-laptop.dnsalias.net <> | 2007-06-09 08:29:51 +0200 |
| commit | a4c6ff85513cd9b42bd1f2f2c28844177ced0270 (patch) | |
| tree | bad1b4f3b50a3eda8a4b8d6070537e3f7336e640 /sql/share | |
| parent | 66980a7bcd6793cbf9b562786f584a7a7ab20d5d (diff) | |
| parent | 9094e97aed8536e628cb6c5a81b79ecc6521be7a (diff) | |
| download | mariadb-git-a4c6ff85513cd9b42bd1f2f2c28844177ced0270.tar.gz | |
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
into kindahl-laptop.dnsalias.net:/home/bk/b24954-mysql-5.1-new-rpl
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 40744d0b07b..b5bfe8a691c 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5843,8 +5843,8 @@ ER_BINLOG_ROW_LOGGING_FAILED eng "Writing one row to the row-based binary log failed" ger "Schreiben einer Zeilen ins zeilenbasierte Binärlog fehlgeschlagen" ER_BINLOG_ROW_WRONG_TABLE_DEF - eng "Table definition on master and slave does not match" - ger "Tabellendefinition auf Master und Slave stimmt nicht überein" + eng "Table definition on master and slave does not match: %s" + ger "Tabellendefinition auf Master und Slave stimmt nicht überein: %s" 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" @@ -6062,3 +6062,13 @@ ER_NO_PARTITION_FOR_GIVEN_VALUE_SILENT ER_BINLOG_UNSAFE_STATEMENT eng "Statement is not safe to log in statement format." swe "Detta är inte säkert att logga i statement-format." +ER_SLAVE_FATAL_ERROR + eng "Fatal error: %s" +ER_SLAVE_RELAY_LOG_READ_FAILURE + eng "Relay log read failure: %s" +ER_SLAVE_RELAY_LOG_WRITE_FAILURE + eng "Relay log write failure: %s" +ER_SLAVE_CREATE_EVENT_FAILURE + eng "Failed to create %s" +ER_SLAVE_MASTER_COM_FAILURE + eng "Master command %s failed: %s" |