diff options
| author | Luis Soares <luis.soares@sun.com> | 2010-01-20 17:01:49 +0000 |
|---|---|---|
| committer | Luis Soares <luis.soares@sun.com> | 2010-01-20 17:01:49 +0000 |
| commit | 8b7d5366ce40280d634bf56f342342fab9d90287 (patch) | |
| tree | 784c4894e7c4b0d4ae79c68e33f184013b67abf2 | |
| parent | 725936c6ec79860d18b2630b102dd1790217a081 (diff) | |
| download | mariadb-git-8b7d5366ce40280d634bf56f342342fab9d90287.tar.gz | |
Removes duplicate entry for ER_SLAVE_IGNORE_SERVER_IDS
in errmsg.txt. Kept the one in that matched the location
in errmsg-utf8.txt, ie after ER_UNKNOWN_LOCALE.
| -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" |