diff options
| author | unknown <joerg@trift2.> | 2008-02-22 16:14:27 +0100 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2008-02-22 16:14:27 +0100 |
| commit | 50ba314c983ad0a3f9c4853e87f1436bf56e8d8a (patch) | |
| tree | c34960a8d8c55cea599ef88af042bbf2ecd8baca /include | |
| parent | a7341383efb1cbdf163488ab1562d15bae263718 (diff) | |
| parent | 9dfc925db0db97f20a561d976bd9c2c40917600a (diff) | |
| download | mariadb-git-50ba314c983ad0a3f9c4853e87f1436bf56e8d8a.tar.gz | |
Merge trift2.:/MySQL/M51/mysql-5.1
into trift2.:/MySQL/M51/push-5.1
configure.in:
Auto merged
extra/yassl/src/handshake.cpp:
Auto merged
extra/yassl/src/template_instnt.cpp:
Auto merged
extra/yassl/src/yassl_imp.cpp:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
storage/ndb/src/common/util/OutputStream.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
Auto merged
storage/ndb/tools/waiter.cpp:
Auto merged
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 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) |