diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-01 00:54:03 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-01 00:54:03 +0100 |
| commit | 59d9d08e2b6f6f35e781d24c47d33d26fb4ba2a5 (patch) | |
| tree | 3e4a302ccf3912d4d8a40aa271414003bfe7c9b6 /include/my_base.h | |
| parent | ce02738d7f2f2688eeec7004dd6a30293d36044f (diff) | |
| parent | 6b6d40fa6ca1fe36f2a51c2723c58dfb3fc025bb (diff) | |
| download | mariadb-git-59d9d08e2b6f6f35e781d24c47d33d26fb4ba2a5.tar.gz | |
5.5 merge
Diffstat (limited to 'include/my_base.h')
| -rw-r--r-- | include/my_base.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/my_base.h b/include/my_base.h index 0984ff8dfa9..83cab753a45 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -470,12 +470,13 @@ enum ha_base_keytype { #define HA_ERR_INDEX_COL_TOO_LONG 179 /* Index column length exceeds limit */ #define HA_ERR_INDEX_CORRUPT 180 /* Index corrupted */ #define HA_ERR_UNDO_REC_TOO_BIG 181 /* Undo log record too big */ -#define HA_ERR_TABLE_IN_FK_CHECK 182 /* Table being used in foreign key check */ -#define HA_FTS_INVALID_DOCID 183 /* Invalid InnoDB Doc ID */ +#define HA_FTS_INVALID_DOCID 182 /* Invalid InnoDB Doc ID */ +#define HA_ERR_TABLE_IN_FK_CHECK 183 /* Table being used in foreign key check */ #define HA_ERR_ROW_NOT_VISIBLE 184 #define HA_ERR_ABORTED_BY_USER 185 #define HA_ERR_DISK_FULL 186 -#define HA_ERR_LAST 186 /* Copy of last error nr */ +#define HA_ERR_INCOMPATIBLE_DEFINITION 187 +#define HA_ERR_LAST 187 /* Copy of last error nr */ /* Number of different errors */ #define HA_ERR_ERRORS (HA_ERR_LAST - HA_ERR_FIRST + 1) |