diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2016-09-06 09:43:16 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2016-09-08 15:49:03 +0300 |
| commit | fec844aca88e1c6b9c36bb0b811e92d9d023ffb9 (patch) | |
| tree | 3e8602113e591b163bf23fffe95c8908cac88ea3 /include | |
| parent | 2e814d4702d71a04388386a9f591d14a35980bfe (diff) | |
| download | mariadb-git-fec844aca88e1c6b9c36bb0b811e92d9d023ffb9.tar.gz | |
Merge InnoDB 5.7 from mysql-5.7.14.
Contains also:
MDEV-10549 mysqld: sql/handler.cc:2692: int handler::ha_index_first(uchar*): Assertion `table_share->tmp_table != NO_TMP_TABLE || m_lock_type != 2' failed. (branch bb-10.2-jan)
Unlike MySQL, InnoDB still uses THR_LOCK in MariaDB
MDEV-10548 Some of the debug sync waits do not work with InnoDB 5.7 (branch bb-10.2-jan)
enable tests that were fixed in MDEV-10549
MDEV-10548 Some of the debug sync waits do not work with InnoDB 5.7 (branch bb-10.2-jan)
fix main.innodb_mysql_sync - re-enable online alter for partitioned innodb tables
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_base.h | 13 | ||||
| -rw-r--r-- | include/my_handler_errors.h | 13 |
2 files changed, 24 insertions, 2 deletions
diff --git a/include/my_base.h b/include/my_base.h index 1317639c528..af053369f93 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -499,7 +499,18 @@ enum ha_base_keytype { #define HA_ERR_FTS_TOO_MANY_WORDS_IN_PHRASE 191 /* Too many words in a phrase */ #define HA_ERR_DECRYPTION_FAILED 192 /* Table encrypted but decypt failed */ -#define HA_ERR_LAST 192 /* Copy of last error nr */ +#define HA_ERR_FK_DEPTH_EXCEEDED 193 /* FK cascade depth exceeded */ +#define HA_MISSING_CREATE_OPTION 194 /* Option Missing during Create */ +#define HA_ERR_SE_OUT_OF_MEMORY 195 /* Out of memory in storage engine */ +#define HA_ERR_TABLE_CORRUPT 196 /* Table/Clustered index is corrupted. */ +#define HA_ERR_QUERY_INTERRUPTED 197 /* The query was interrupted */ +#define HA_ERR_TABLESPACE_MISSING 198 /* Missing Tablespace */ +#define HA_ERR_TABLESPACE_IS_NOT_EMPTY 199 /* Tablespace is not empty */ +#define HA_ERR_WRONG_FILE_NAME 200 /* Invalid Filename */ +#define HA_ERR_NOT_ALLOWED_COMMAND 201 /* Operation is not allowed */ +#define HA_ERR_COMPUTE_FAILED 202 /* Compute generated column value failed */ +#define HA_ERR_INNODB_READ_ONLY 203 /* InnoDB is in read only mode */ +#define HA_ERR_LAST 203 /* Copy of last error nr * */ /* Number of different errors */ #define HA_ERR_ERRORS (HA_ERR_LAST - HA_ERR_FIRST + 1) diff --git a/include/my_handler_errors.h b/include/my_handler_errors.h index 5af6a359348..3d05fb75054 100644 --- a/include/my_handler_errors.h +++ b/include/my_handler_errors.h @@ -95,7 +95,18 @@ static const char *handler_error_messages[]= "Disk full", "Incompatible key or row definition between the MariaDB .frm file and the information in the storage engine. You have to dump and restore the table to fix this", "Too many words in a FTS phrase or proximity search", - "Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match." + "Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.", + "Foreign key cascade delete/update exceeds max depth", + "Table storage engine found required create option missing", + "Out of memory in storage engine", + "Operation cannot be performed. The table is missing, corrupt or contains bad data.", + "Query execution was interrupted", + "Tablespace is missing for table", + "Tablespace is not empty", + "Incorrect File Name", + "Table storage engine found required create option missing", + "Compute virtual column value failed", + "InnoDB is in read only mode" }; #endif /* MYSYS_MY_HANDLER_ERRORS_INCLUDED */ |