diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-09-14 08:27:14 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-09-14 08:27:36 +0300 |
| commit | d581ef5b2c68465815d78548357e3e104e39f5d6 (patch) | |
| tree | 97a63640fd5aea58652f6121135442607b8a1ff7 /include | |
| parent | 27ec0e159b05155ee92aaabe9466d78ef3a26712 (diff) | |
| download | mariadb-git-d581ef5b2c68465815d78548357e3e104e39f5d6.tar.gz | |
MDEV-8764: Wrong error when encrypted table can't be decrypted.
Add a new error message when table is encrypted but decryption
fails. Use this new error message on InnoDB/XtraDB.
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_base.h | 4 | ||||
| -rw-r--r-- | include/my_handler_errors.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/my_base.h b/include/my_base.h index a52ad51485e..91a26f316a7 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -501,7 +501,9 @@ enum ha_base_keytype { #define HA_ERR_DISK_FULL 189 #define HA_ERR_INCOMPATIBLE_DEFINITION 190 #define HA_ERR_FTS_TOO_MANY_WORDS_IN_PHRASE 191 /* Too many words in a phrase */ -#define HA_ERR_LAST 191 /* Copy of last error nr */ +#define HA_ERR_DECRYPTION_FAILED 192 /* Table encrypted but + decypt failed */ +#define HA_ERR_LAST 192 /* 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 a7afcfe93a3..5af6a359348 100644 --- a/include/my_handler_errors.h +++ b/include/my_handler_errors.h @@ -94,7 +94,8 @@ static const char *handler_error_messages[]= "Operation was interrupted by end user (probably kill command?)", "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" + "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." }; #endif /* MYSYS_MY_HANDLER_ERRORS_INCLUDED */ |