diff options
| author | unknown <aelkin/andrei@mysql1000.(none)> | 2008-01-31 17:02:29 +0200 |
|---|---|---|
| committer | unknown <aelkin/andrei@mysql1000.(none)> | 2008-01-31 17:02:29 +0200 |
| commit | 64dbfdd7db718b0334e910892031f13ed5795a7b (patch) | |
| tree | 834bba98e1d4335161f7f522e8dabdb9c8a067b5 /include | |
| parent | 6a873248d1d226b7610d2f3f0fa3c8d7e023ab87 (diff) | |
| parent | b6ec38cecc0285e8939e7b25aa5c63bada070974 (diff) | |
| download | mariadb-git-64dbfdd7db718b0334e910892031f13ed5795a7b.tar.gz | |
Merge mysql1000.(none):/mnt/nb/home/elkin/MySQL/TEAM/FIXES/5.1/bug32971-error_propag_slave
into mysql1000.(none):/home/andrei/MySQL/FIXES/5.1/bug32971-rbr_error_prop
mysql-test/extra/rpl_tests/rpl_row_tabledefs.test:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
manual merge use local
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
manual merge use local
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_base.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/my_base.h b/include/my_base.h index e65a04bb16d..69a6de67359 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -411,7 +411,9 @@ enum ha_base_keytype { statement */ #define HA_ERR_CORRUPT_EVENT 171 /* The event was corrupt, leading to illegal data being read */ -#define HA_ERR_LAST 171 /*Copy last error nr.*/ +#define HA_ERR_ROWS_EVENT_APPLY 172 /* The event could not be processed + no other hanlder error happened */ +#define HA_ERR_LAST 172 /*Copy last error nr.*/ /* Add error numbers before HA_ERR_LAST and change it accordingly. */ #define HA_ERR_ERRORS (HA_ERR_LAST - HA_ERR_FIRST + 1) |