diff options
| author | Arun Kuruvila <arun.kuruvila@oracle.com> | 2015-09-22 14:51:48 +0530 |
|---|---|---|
| committer | Arun Kuruvila <arun.kuruvila@oracle.com> | 2015-09-22 14:51:48 +0530 |
| commit | 86375f7fa6a428bfc405f85335685cd1dff25302 (patch) | |
| tree | 908324ef5fb15fe6fe85f3cc9d09a0418bda86df /sql | |
| parent | 8ea80ecfeb88846ee47c65011eb9ff7eddab84b3 (diff) | |
| download | mariadb-git-86375f7fa6a428bfc405f85335685cd1dff25302.tar.gz | |
Bug #21370329 : FLUSH DES_KEY_FILE MAY NOT WORK
Description: The command FLUSH DES_KEY_FILE is expected to
reload the DES keys from the file that was specified with
the "--des-key-file" option at server startup. But it is not
behaving as expected.
Analysis: The des file reload is defined within a wrong
conditional directive, rendering the command ineffective.
Macro "OPENSSL" was used instead of "HAVE_OPENSSL" macro.
Fix: "OPENSSL" macro is changed to "HAVE_OPENSSL".
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.h | 3 | ||||
| -rw-r--r-- | sql/sql_reload.cc | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index 655fb93df73..0253c2a0b43 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved. 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 @@ -349,6 +349,7 @@ extern mysql_mutex_t extern MYSQL_PLUGIN_IMPORT mysql_mutex_t LOCK_thread_count; extern MYSQL_PLUGIN_IMPORT mysql_mutex_t LOCK_thd_remove; #ifdef HAVE_OPENSSL +extern char* des_key_file; extern mysql_mutex_t LOCK_des_key_file; #endif extern mysql_mutex_t LOCK_server_started; diff --git a/sql/sql_reload.cc b/sql/sql_reload.cc index b0665a9ea6b..40e350c4ddd 100644 --- a/sql/sql_reload.cc +++ b/sql/sql_reload.cc @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. 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 @@ -25,6 +25,7 @@ #include "hostname.h" // hostname_cache_refresh #include "sql_repl.h" // reset_master, reset_slave #include "debug_sync.h" +#include "des_key_file.h" /** @@ -297,7 +298,7 @@ bool reload_acl_and_cache(THD *thd, unsigned long options, } } #endif -#ifdef OPENSSL +#ifdef HAVE_OPENSSL if (options & REFRESH_DES_KEY_FILE) { if (des_key_file && load_des_key_file(des_key_file)) |