diff options
| author | Andrei Elkin <aelkin@mysql.com> | 2009-10-01 19:44:53 +0300 |
|---|---|---|
| committer | Andrei Elkin <aelkin@mysql.com> | 2009-10-01 19:44:53 +0300 |
| commit | d91aa57c38e9baf0bbf31a596e79bea2504e50bb (patch) | |
| tree | e2849e3cfc039882029b2eb6059cefa89b85f0de /sql/share | |
| parent | c676cebbea734691b41bf7e8edcbe61e74a53f62 (diff) | |
| download | mariadb-git-d91aa57c38e9baf0bbf31a596e79bea2504e50bb.tar.gz | |
backporting bug@27808 fixes
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 3aba434b284..18d3a41424a 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -6163,6 +6163,9 @@ ER_SLAVE_HEARTBEAT_FAILURE ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE eng "The requested value for the heartbeat period %s %s" +ER_SLAVE_IGNORE_SERVER_IDS + eng "The requested server id %d clashes with the slave startup option --replicate-same-server-id" + ER_NDB_REPLICATION_SCHEMA_ERROR eng "Bad schema for mysql.ndb_replication table. Message: %-.64s" ER_CONFLICT_FN_PARSE_ERROR |