diff options
| author | Satya B <satya.bn@sun.com> | 2009-07-24 12:15:06 +0530 |
|---|---|---|
| committer | Satya B <satya.bn@sun.com> | 2009-07-24 12:15:06 +0530 |
| commit | ba7c6884d04b517e67c3741b10044f903c86de97 (patch) | |
| tree | e850059710c4ddef34b737bba2433da01983614e /include | |
| parent | 47a9a252284abb560c740a701f1eec1de038fdec (diff) | |
| parent | 4465e301f239c1f2ba3af03d5e4ede33713f4a85 (diff) | |
| download | mariadb-git-ba7c6884d04b517e67c3741b10044f903c86de97.tar.gz | |
merge 5.0-bugteam to 5.1-bugteam
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 22f518b0f9a..a01b2ec9b82 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -441,7 +441,8 @@ enum ha_base_keytype { #define HA_ERR_INITIALIZATION 174 /* Error during initialization */ #define HA_ERR_FILE_TOO_SHORT 175 /* File too short */ #define HA_ERR_WRONG_CRC 176 /* Wrong CRC on page */ -#define HA_ERR_LAST 176 /* Copy of last error nr */ +#define HA_ERR_TOO_MANY_CONCURRENT_TRXS 177 /*Too many active concurrent transactions */ +#define HA_ERR_LAST 177 /* Copy of last error nr */ /* Number of different errors */ #define HA_ERR_ERRORS (HA_ERR_LAST - HA_ERR_FIRST + 1) |