diff options
| author | unknown <serg@janus.mylan> | 2008-02-11 15:33:25 +0100 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2008-02-11 15:33:25 +0100 |
| commit | 2944f4b01be1c537743d0843fabed3c15040696c (patch) | |
| tree | f9a02fbc33c7218457e56edc837b9040f5530098 /include/my_base.h | |
| parent | 5fa560e995a01c87bd7d20264c85c2ec66c19748 (diff) | |
| parent | 2942c1ea4d7bb89917da8ab4a301ad2cbb1f6f9a (diff) | |
| download | mariadb-git-2944f4b01be1c537743d0843fabed3c15040696c.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into janus.mylan:/usr/home/serg/Abk/mysql-maria
mysql-test/mysql-test-run.pl:
Auto merged
sql/log_event.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/share/errmsg.txt:
Auto merged
include/my_base.h:
merged
Diffstat (limited to 'include/my_base.h')
| -rw-r--r-- | include/my_base.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/my_base.h b/include/my_base.h index 04de6f55f44..ddefb5be7b4 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -434,13 +434,15 @@ enum ha_base_keytype { #define HA_ERR_RECORD_IS_THE_SAME 169 /* It is not possible to log this statement */ #define HA_ERR_LOGGING_IMPOSSIBLE 170 -#define HA_ERR_CORRUPT_EVENT 171 /* The event was corrupt, leading to - illegal data being read */ +#define HA_ERR_CORRUPT_EVENT 171 /* The event was corrupt, leading to */ + /* illegal data being read */ #define HA_ERR_NEW_FILE 172 /* New file format */ #define HA_ERR_INITIALIZATION 173 /* Error during initialization */ #define HA_ERR_FILE_TOO_SHORT 174 /* File too short */ #define HA_ERR_WRONG_CRC 175 /* Wrong CRC on page */ -#define HA_ERR_LAST 175 /* Copy of last error nr */ +#define HA_ERR_ROWS_EVENT_APPLY 176 /* The event could not be processed */ + /* no other hanlder error happened */ +#define HA_ERR_LAST 176 /* Copy of last error nr */ /* Number of different errors */ #define HA_ERR_ERRORS (HA_ERR_LAST - HA_ERR_FIRST + 1) |