summaryrefslogtreecommitdiff
path: root/include/my_handler_errors.h
diff options
context:
space:
mode:
authorJan Lindström <jan.lindstrom@mariadb.com>2015-09-14 08:27:14 +0300
committerJan Lindström <jan.lindstrom@mariadb.com>2015-09-14 08:27:36 +0300
commitd581ef5b2c68465815d78548357e3e104e39f5d6 (patch)
tree97a63640fd5aea58652f6121135442607b8a1ff7 /include/my_handler_errors.h
parent27ec0e159b05155ee92aaabe9466d78ef3a26712 (diff)
downloadmariadb-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/my_handler_errors.h')
-rw-r--r--include/my_handler_errors.h3
1 files changed, 2 insertions, 1 deletions
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 */