diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-05-13 21:57:24 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-05-15 18:12:01 +0200 |
| commit | 2300fe2e0ed59e36046bb867cc7499bf4c3d7c27 (patch) | |
| tree | 9adab44a30ef40e5cf1e1661220a9cf8079cb5b5 /mysql-test/r/plugin.result | |
| parent | 632f2307f775d255bab948de2178feb85fcac970 (diff) | |
| download | mariadb-git-2300fe2e0ed59e36046bb867cc7499bf4c3d7c27.tar.gz | |
Identical key derivation code in XtraDB/InnoDB/Aria
* Extract it into the "encryption_scheme" service.
* Make these engines to use the service, remove duplicate code.
* Change MY_AES_xxx error codes, to return them safely
from encryption_scheme_encrypt/decrypt without conflicting
with ENCRYPTION_SCHEME_KEY_INVALID error
Diffstat (limited to 'mysql-test/r/plugin.result')
| -rw-r--r-- | mysql-test/r/plugin.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/plugin.result b/mysql-test/r/plugin.result index 9f4aff6bae9..42a29f25432 100644 --- a/mysql-test/r/plugin.result +++ b/mysql-test/r/plugin.result @@ -15,7 +15,7 @@ PLUGIN_STATUS ACTIVE PLUGIN_TYPE STORAGE ENGINE PLUGIN_TYPE_VERSION # PLUGIN_LIBRARY ha_example.so -PLUGIN_LIBRARY_VERSION 1.10 +PLUGIN_LIBRARY_VERSION 1.11 PLUGIN_AUTHOR Brian Aker, MySQL AB PLUGIN_DESCRIPTION Example storage engine PLUGIN_LICENSE GPL @@ -28,7 +28,7 @@ PLUGIN_STATUS ACTIVE PLUGIN_TYPE DAEMON PLUGIN_TYPE_VERSION # PLUGIN_LIBRARY ha_example.so -PLUGIN_LIBRARY_VERSION 1.10 +PLUGIN_LIBRARY_VERSION 1.11 PLUGIN_AUTHOR Sergei Golubchik PLUGIN_DESCRIPTION Unusable Daemon PLUGIN_LICENSE GPL @@ -67,7 +67,7 @@ PLUGIN_STATUS DELETED PLUGIN_TYPE STORAGE ENGINE PLUGIN_TYPE_VERSION # PLUGIN_LIBRARY ha_example.so -PLUGIN_LIBRARY_VERSION 1.10 +PLUGIN_LIBRARY_VERSION 1.11 PLUGIN_AUTHOR Brian Aker, MySQL AB PLUGIN_DESCRIPTION Example storage engine PLUGIN_LICENSE GPL |