diff options
| author | unknown <tomas@whalegate.ndb.mysql.com> | 2007-03-30 08:37:47 +0200 |
|---|---|---|
| committer | unknown <tomas@whalegate.ndb.mysql.com> | 2007-03-30 08:37:47 +0200 |
| commit | 5c602713da0eaec2f2e1f6b34ba4cb4447f5932c (patch) | |
| tree | f91f18dcd4e37746aebc52f3388f2448ed4b02b6 /sql/share/errmsg.txt | |
| parent | 7afaea74bef37406c51c045d514ea03eb34824e2 (diff) | |
| parent | 81a4074b6ee1e72c8360261d10ba4e4ba4216582 (diff) | |
| download | mariadb-git-5c602713da0eaec2f2e1f6b34ba4cb4447f5932c.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
client/Makefile.am:
Auto merged
Diffstat (limited to 'sql/share/errmsg.txt')
| -rw-r--r-- | sql/share/errmsg.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 8159f014e93..a42f94760ab 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -6055,3 +6055,5 @@ ER_EVENT_CANNOT_CREATE_IN_THE_PAST eng "Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. Event has not been created" ER_EVENT_CANNOT_ALTER_IN_THE_PAST eng "Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. Event has not been altered" +ER_SLAVE_INCIDENT + eng "The incident %s occured on the master. Message: %-.64s" |