diff options
| author | Michael Widenius <monty@mariadb.org> | 2014-12-20 15:44:23 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@mariadb.org> | 2014-12-20 15:44:23 +0200 |
| commit | 406b31e628145f6af0fa567c0e42b8391e5173bb (patch) | |
| tree | aff311e03c5bb078fe67b090bd8a0e602beed547 /plugin/file_key_management_plugin/KeySingleton.h | |
| parent | 634428b37fd039b862c8277a0c7b0b5f56e765fc (diff) | |
| download | mariadb-git-bb-10.1-eperi.tar.gz | |
Fixes for encryption from eperibb-10.1-eperi
Diffstat (limited to 'plugin/file_key_management_plugin/KeySingleton.h')
| -rw-r--r-- | plugin/file_key_management_plugin/KeySingleton.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/plugin/file_key_management_plugin/KeySingleton.h b/plugin/file_key_management_plugin/KeySingleton.h index 2b2f3991998..d66ff44df27 100644 --- a/plugin/file_key_management_plugin/KeySingleton.h +++ b/plugin/file_key_management_plugin/KeySingleton.h @@ -47,10 +47,9 @@ public: virtual ~KeySingleton() {encKeys.~EncKeys();} static KeySingleton& getInstance(); // Init the instance for only one time - static KeySingleton& getInstance(const char *name, const char *url, - const int initType, const char *filekey); + static KeySingleton& getInstance(const char *filename, const char *filekey); keyentry *getKeys(int id); - ibool hasKey(int id); + bool hasKey(int id); static bool isAvailable() { return instanceInited; } |