diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-11-28 12:10:44 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-11-28 12:10:44 +0100 |
| commit | 1387e71531495b1224bfafd6867ae5fae9cf469c (patch) | |
| tree | 6307410443d2eeee3817acf552e3ce583e9444d8 /include/my_base.h | |
| parent | 44db9c41b389a2eacdd9591f825ed86e9bffd0e8 (diff) | |
| download | mariadb-git-1387e71531495b1224bfafd6867ae5fae9cf469c.tar.gz | |
MDEV-5281 Partitioning issue after upgrade from 10.0.3-1 to 10.0.5-1
merged from 5.6:
Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING
Bug#16589511: MYSQL_UPGRADE FAILS TO WRITE OUT ENTIRE ALTER TABLE ... ALGORITHM= ... STATEMENT
Bug#16274455: CAN NOT ACESS PARTITIONED TABLES WHEN DOWNGRADED FROM 5.6.11 TO 5.6.10
plus minor changes from 5.6, mainly comments
Diffstat (limited to 'include/my_base.h')
| -rw-r--r-- | include/my_base.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/my_base.h b/include/my_base.h index ed27ef7e843..c9f9a8a4ed3 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -483,14 +483,13 @@ enum ha_base_keytype { #define HA_ERR_GENERIC 168 /* Generic error */ /* row not actually updated: new values same as the old values */ #define HA_ERR_RECORD_IS_THE_SAME 169 -/* It is not possible to log this statement */ -#define HA_ERR_LOGGING_IMPOSSIBLE 170 -/* The event was corrupt, leading to illegal data being read */ +#define HA_ERR_LOGGING_IMPOSSIBLE 170 /* It is not possible to log this + statement */ #define HA_ERR_CORRUPT_EVENT 171 /* The event was corrupt, leading to illegal data being read */ #define HA_ERR_NEW_FILE 172 /* New file format */ -/* The event could not be processed no other handler error happened */ -#define HA_ERR_ROWS_EVENT_APPLY 173 +#define HA_ERR_ROWS_EVENT_APPLY 173 /* The event could not be processed + no other hanlder error happened */ #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 */ @@ -504,10 +503,11 @@ enum ha_base_keytype { #define HA_ERR_TABLE_IN_FK_CHECK 183 /* Table being used in foreign key check */ #define HA_ERR_TABLESPACE_EXISTS 184 /* The tablespace existed in storage engine */ #define HA_ERR_TOO_MANY_FIELDS 185 /* Table has too many columns */ -#define HA_ERR_ROW_NOT_VISIBLE 186 -#define HA_ERR_ABORTED_BY_USER 187 -#define HA_ERR_DISK_FULL 188 -#define HA_ERR_LAST 188 /* Copy of last error nr */ +#define HA_ERR_ROW_IN_WRONG_PARTITION 186 /* Row in wrong partition */ +#define HA_ERR_ROW_NOT_VISIBLE 187 +#define HA_ERR_ABORTED_BY_USER 188 +#define HA_ERR_DISK_FULL 189 +#define HA_ERR_LAST 189 /* Copy of last error nr */ /* Number of different errors */ #define HA_ERR_ERRORS (HA_ERR_LAST - HA_ERR_FIRST + 1) |