diff options
author | Michael Widenius <monty@askmonty.org> | 2011-05-19 19:23:06 +0300 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2011-05-19 19:23:06 +0300 |
commit | 54a3d1869c609407488782fd74c345b408dc9cdc (patch) | |
tree | 8f76031513b819d48093721a97ad359b4ce54372 /include | |
parent | 73f4d0c6e435c2562ea2a18ff7f947497e995c51 (diff) | |
parent | 29b751c796269b069eae02d361d0f32e146614f6 (diff) | |
download | mariadb-git-54a3d1869c609407488782fd74c345b408dc9cdc.tar.gz |
Automatic merge
Diffstat (limited to 'include')
-rw-r--r-- | include/my_base.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/my_base.h b/include/my_base.h index c17897670ba..0029d01d75e 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -446,7 +446,8 @@ enum ha_base_keytype { #define HA_ERR_ROW_NOT_VISIBLE 177 #define HA_ERR_TOO_MANY_CONCURRENT_TRXS 178 /*Too many active concurrent transactions */ #define HA_ERR_ABORTED_BY_USER 179 -#define HA_ERR_LAST 179 /* Copy of last error nr */ +#define HA_ERR_DISK_FULL 180 +#define HA_ERR_LAST 180 /* Copy of last error nr */ /* Number of different errors */ #define HA_ERR_ERRORS (HA_ERR_LAST - HA_ERR_FIRST + 1) |