diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2015-09-18 18:39:08 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-09-18 18:39:08 +0200 |
| commit | 9c6405fefaf7311b31591ab445660e8f34d64295 (patch) | |
| tree | 87aa09ef6a2f9d33d2d19ef56d3e76e57114d361 /storage/xtradb/include/db0err.h | |
| parent | f4fe138321092c8dcd02caf22bdbad9698ee6829 (diff) | |
| parent | 79140b03839a6b46a92736bd2ce03cefd43a5058 (diff) | |
| download | mariadb-git-9c6405fefaf7311b31591ab445660e8f34d64295.tar.gz | |
Commit resolved conflicts
Diffstat (limited to 'storage/xtradb/include/db0err.h')
| -rw-r--r-- | storage/xtradb/include/db0err.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/storage/xtradb/include/db0err.h b/storage/xtradb/include/db0err.h index dab917e18db..b11c5f4ea1a 100644 --- a/storage/xtradb/include/db0err.h +++ b/storage/xtradb/include/db0err.h @@ -1,6 +1,7 @@ /***************************************************************************** Copyright (c) 1996, 2014, 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 the terms of the GNU General Public License as published by the Free Software @@ -132,6 +133,11 @@ enum dberr_t { /*< Too many words in a phrase */ DB_TOO_BIG_FOR_REDO, /* Record length greater than 10% of redo log */ + DB_DECRYPTION_FAILED, /* Tablespace encrypted and + decrypt operation failed because + of missing key management plugin, + or missing or incorrect key or + incorret AES method or algorithm. */ /* The following are partial failure codes */ DB_FAIL = 1000, DB_OVERFLOW, |