diff options
| author | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-06-22 01:41:24 +0200 |
|---|---|---|
| committer | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-06-22 01:41:24 +0200 |
| commit | 292a95c1ff30d28edccbe30d88987fe3a074be60 (patch) | |
| tree | dd5c2482c8e268e034a15a89a43f80594b49a540 /include | |
| parent | 274829b48103c140652fd824f07f64329be6b721 (diff) | |
| parent | 08b43c99977bceb05d82b5a154c68387551310c2 (diff) | |
| download | mariadb-git-292a95c1ff30d28edccbe30d88987fe3a074be60.tar.gz | |
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
mysql-test/t/disabled.def:
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 617cdb8c3f0..f8830dc8a25 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -396,7 +396,9 @@ enum ha_base_keytype { #define HA_ERR_AUTOINC_READ_FAILED 166 /* Failed to get next autoinc value */ #define HA_ERR_AUTOINC_ERANGE 167 /* Failed to set row autoinc value */ #define HA_ERR_GENERIC 168 /* Generic error */ -#define HA_ERR_LAST 168 /*Copy last error nr.*/ +#define HA_ERR_LOGGING_IMPOSSIBLE 169 /* It is not possible to log this + statement */ +#define HA_ERR_LAST 169 /*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) |