diff options
| author | mats@romeo.(none) <> | 2007-03-29 21:38:03 +0200 |
|---|---|---|
| committer | mats@romeo.(none) <> | 2007-03-29 21:38:03 +0200 |
| commit | e12cc44ac3b13b46d5db9920c6e47838de9a5ee4 (patch) | |
| tree | 7f9eedf72c49812d1bdb3523f075b644a6e43f55 /sql/share | |
| parent | 9fb3199c2640fe74dd631ca6bc780c9c97f0237d (diff) | |
| parent | 7c187c2c9b0e5ba8796f5499d14ee13543a941ec (diff) | |
| download | mariadb-git-e12cc44ac3b13b46d5db9920c6e47838de9a5ee4.tar.gz | |
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
into romeo.(none):/home/bk/w3464-mysql-5.1-new-rpl
Diffstat (limited to 'sql/share')
| -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" |