diff options
| author | unknown <istruewing@stella.local> | 2007-11-27 19:29:10 +0100 |
|---|---|---|
| committer | unknown <istruewing@stella.local> | 2007-11-27 19:29:10 +0100 |
| commit | 30aee30b0db605ce03ed15431bae5e8f006794ec (patch) | |
| tree | 96771b5438e731e696f7b3fd75a500990df07761 /include/my_base.h | |
| parent | 9f1043b5d128521110ef411648e92aac5a96466c (diff) | |
| parent | 54953ec25cdb1340be98f400eb31f53f3c49bf55 (diff) | |
| download | mariadb-git-30aee30b0db605ce03ed15431bae5e8f006794ec.tar.gz | |
Merge stella.local:/home2/mydev/mysql-5.1-amain
into stella.local:/home2/mydev/mysql-5.1-axmrg
include/my_base.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/suite/ndb/t/disabled.def:
Auto merged
mysql-test/t/partition.test:
Auto merged
sql/handler.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
client/mysql.cc:
Manual merge
mysql-test/suite/rpl/t/disabled.def:
Manual merge
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 f79ff8805b9..c2eb6a040c1 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -413,9 +413,11 @@ enum ha_base_keytype { #define HA_ERR_RECORD_IS_THE_SAME 169 /* row not actually updated : new values same as the old values */ -#define HA_ERR_LOGGING_IMPOSSIBLE 170 /* It is not possible to log this - statement */ -#define HA_ERR_LAST 170 /*Copy last error nr.*/ +#define HA_ERR_LOGGING_IMPOSSIBLE 170 /* It is not possible to log this + 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.*/ /* Add error numbers before HA_ERR_LAST and change it accordingly. */ #define HA_ERR_ERRORS (HA_ERR_LAST - HA_ERR_FIRST + 1) |