diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-12-19 14:24:38 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-12-19 14:24:38 -0500 |
| commit | dad555a09c8d590132c77c192a18d7fc1f8fe91e (patch) | |
| tree | 38fb545e5df0a24333b8284c816f5bea95d19a03 /sql/sql_reload.cc | |
| parent | 18173ddfc4081407832d9a6703d1b8356b7defe9 (diff) | |
| parent | 90ea0145856338221803ebb9b446ed2a6e082412 (diff) | |
| download | mariadb-git-dad555a09c8d590132c77c192a18d7fc1f8fe91e.tar.gz | |
Merge tag 'mariadb-10.0.23' into 10.0-galera
Diffstat (limited to 'sql/sql_reload.cc')
| -rw-r--r-- | sql/sql_reload.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_reload.cc b/sql/sql_reload.cc index ca99a81b455..63809fae7ee 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 @@ -27,7 +27,7 @@ #include "sql_repl.h" // reset_master, reset_slave #include "rpl_mi.h" // Master_info::data_lock #include "debug_sync.h" -#include "rpl_mi.h" +#include "des_key_file.h" static void disable_checkpoints(THD *thd); @@ -345,7 +345,7 @@ bool reload_acl_and_cache(THD *thd, unsigned long 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)) |