diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-01-22 12:50:33 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-01-22 12:50:33 +0100 |
| commit | cb5b0d4ffa964b2808dfb42b64f53b4b9e2d9bc1 (patch) | |
| tree | 16e166d97e758468adaf6e8c29470666e9910f4e /sql/share | |
| parent | 68c66c645a76608438e33259be85f3ca4b244ed8 (diff) | |
| parent | 08bcd2d8f67dcacd36abd2592fa2a59321abe7c2 (diff) | |
| download | mariadb-git-cb5b0d4ffa964b2808dfb42b64f53b4b9e2d9bc1.tar.gz | |
merge
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 0d108fc019f..4ee0cf9d758 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -6235,8 +6235,6 @@ ER_BINLOG_UNSAFE_NONTRANS_AFTER_TRANS ER_MESSAGE_AND_STATEMENT eng "%s Statement: %s" -ER_SLAVE_IGNORE_SERVER_IDS - eng "The requested server id %d clashes with the slave startup option --replicate-same-server-id" ER_DEBUG_SYNC_TIMEOUT eng "debug sync point wait timed out" ger "Debug Sync Point Wartezeit überschritten" |