diff options
| author | unknown <lars/lthalmann@dl145j.mysql.com> | 2007-07-02 13:42:39 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@dl145j.mysql.com> | 2007-07-02 13:42:39 +0200 |
| commit | f00722b95e7fce173e51706d28fa3c5886d9f7e6 (patch) | |
| tree | 999dba896cdd1de30a761a081f695ad4ed390607 /include/my_base.h | |
| parent | de0ba5c894df8f86512d025f4196d62687efb1bb (diff) | |
| parent | e3a6b29b556fec051fbe7d8e61b23bf285dc2e02 (diff) | |
| download | mariadb-git-f00722b95e7fce173e51706d28fa3c5886d9f7e6.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
mysql-test/t/disabled.def:
Auto merged
sql/item_sum.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
include/my_base.h:
Manual merge main->rpl 5.1
mysql-test/t/innodb.test:
Manual merge main->rpl 5.1
Diffstat (limited to 'include/my_base.h')
| -rw-r--r-- | include/my_base.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/my_base.h b/include/my_base.h index b2a8b4b6b67..bb5fdfc8392 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -398,7 +398,10 @@ enum ha_base_keytype { #define HA_ERR_GENERIC 168 /* Generic error */ #define HA_ERR_RECORD_IS_THE_SAME 169 /* row not actually updated : new values same as the old values */ -#define HA_ERR_LAST 169 /*Copy last error nr.*/ + +#define HA_ERR_LOGGING_IMPOSSIBLE 170 /* It is not possible to log this + statement */ +#define HA_ERR_LAST 170 /*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) |