diff options
| author | unknown <lars/lthalmann@dl145k.mysql.com> | 2007-07-02 17:45:46 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@dl145k.mysql.com> | 2007-07-02 17:45:46 +0200 |
| commit | daf74b21f0b5f6fdcd3345ce2c6aa13684587534 (patch) | |
| tree | 3bb5f2657b5e5c5a188ca7ae132d89d345ecd90b /include | |
| parent | 3fcaaceaa99050df9cd23a6e0480dc2b8b8c688b (diff) | |
| parent | f00722b95e7fce173e51706d28fa3c5886d9f7e6 (diff) | |
| download | mariadb-git-daf74b21f0b5f6fdcd3345ce2c6aa13684587534.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.1
into mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'include')
| -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) |