diff options
| author | unknown <mkindahl@dl145h.mysql.com> | 2008-02-05 14:52:20 +0100 |
|---|---|---|
| committer | unknown <mkindahl@dl145h.mysql.com> | 2008-02-05 14:52:20 +0100 |
| commit | a63ef17fca535354e243dcbecd92215020d13f6d (patch) | |
| tree | 19d2a34da5d05faad3a9ed7be0d7f3efe6794830 /include/my_base.h | |
| parent | df2cf8c78dc022472dd22584a140f579ad8cfe03 (diff) | |
| parent | d4e3ab9cf6b1f6455687117e37ad4d8e61e65fbc (diff) | |
| download | mariadb-git-a63ef17fca535354e243dcbecd92215020d13f6d.tar.gz | |
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
include/my_base.h:
Auto merged
mysql-test/include/show_binlog_events2.inc:
Auto merged
mysql-test/suite/binlog/t/binlog_old_versions.test:
Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
Auto merged
mysql-test/suite/rpl/t/rpl_loaddata_map-master.opt:
Auto merged
mysql-test/suite/rpl/t/rpl_loaddata_map-slave.opt:
Auto merged
sql/log_event_old.cc:
Auto merged
sql/sql_binlog.cc:
Auto merged
mysql-test/suite/rpl/r/rpl_loaddata_map.result:
Manual merge.
mysql-test/suite/rpl/r/rpl_user.result:
Manual merge.
mysql-test/suite/rpl/t/rpl_loaddata_map.test:
Manual merge.
mysql-test/suite/rpl/t/rpl_user.test:
Manual merge.
sql/log_event.cc:
Manual merge.
sql/rpl_record.cc:
Manual merge.
Diffstat (limited to 'include/my_base.h')
| -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 947f7695215..4f552fa5fe0 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -419,7 +419,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) |