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 /storage/innobase/include/db0err.h | |
| 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 'storage/innobase/include/db0err.h')
| -rw-r--r-- | storage/innobase/include/db0err.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/storage/innobase/include/db0err.h b/storage/innobase/include/db0err.h index 5297d6b0daf..32f9117af84 100644 --- a/storage/innobase/include/db0err.h +++ b/storage/innobase/include/db0err.h @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2015, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under @@ -137,6 +137,7 @@ enum dberr_t { /*< Too many words in a phrase */ DB_TABLESPACE_TRUNCATED, /*!< tablespace was truncated */ + DB_DECRYPTION_FAILED, /* Tablespace encrypted and decrypt operation failed because of missing key management plugin, @@ -157,6 +158,12 @@ enum dberr_t { DB_IO_NO_PUNCH_HOLE_TABLESPACE, /*!< The tablespace doesn't support punch hole */ + DB_IO_DECRYPT_FAIL, /*!< Failure to decrypt a page + after reading it from disk */ + + DB_IO_NO_ENCRYPT_TABLESPACE, /*!< The tablespace doesn't support + encrypt */ + DB_IO_PARTIAL_FAILED, /*!< Partial IO request failed */ DB_FORCED_ABORT, /*!< Transaction was forced to rollback @@ -169,6 +176,10 @@ enum dberr_t { DB_COMPUTE_VALUE_FAILED, /*!< Compute generated value failed */ + DB_NO_FK_ON_S_BASE_COL, /*!< Cannot add foreign constrain + placed on the base column of + stored column */ + /* The following are partial failure codes */ DB_FAIL = 1000, DB_OVERFLOW, |