Merge branch 'mysql-5.6' into mysql-5.7

Arun Kuruvila · Arun Kuruvila · commit 2a876f5d1705 · 2015-09-22T14:56:53.000+05:30
diff --git a/sql/mysqld.h b/sql/mysqld.h
@@ -810,6 +810,7 @@ extern mysql_mutex_t
        LOCK_sql_slave_skip_counter, LOCK_slave_net_timeout,
        LOCK_offline_mode, LOCK_default_password_lifetime;
 #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
@@ -31,6 +31,7 @@
 #include "connection_handler_impl.h"
 #include "opt_costconstantcache.h"     // reload_optimizer_cost_constants
 #include "log.h"         // query_logger
+#include "des_key_file.h"
 
 
 /**
@@ -314,7 +315,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))

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`	`#include "connection_handler_impl.h"`
`32`	`32`	`#include "opt_costconstantcache.h" // reload_optimizer_cost_constants`
`33`	`33`	`#include "log.h" // query_logger`
	`34`	`+#include "des_key_file.h"`
`34`	`35`
`35`	`36`
`36`	`37`	`/**`
`@@ -314,7 +315,7 @@ bool reload_acl_and_cache(THD *thd, unsigned long options,`
`314`	`315`	`}`
`315`	`316`	`}`
`316`	`317`	`#endif`
`317`		`-#ifdef OPENSSL`
	`318`	`+#ifdef HAVE_OPENSSL`
`318`	`319`	`if (options & REFRESH_DES_KEY_FILE)`
`319`	`320`	`{`
`320`	`321`	`if (des_key_file && load_des_key_file(des_key_file))`