diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-12-09 10:00:49 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-12-09 10:00:49 +0100 |
| commit | abf9d35213ba482a3927651ddb98baa47aeb34fd (patch) | |
| tree | 567bee47df18c21d5fbc09bbb4fee4e8f26df4d9 /sql/sql_reload.cc | |
| parent | 50a796dcba2abe5f25c1e4cd8a69d7ea43343a8d (diff) | |
| parent | 40ae1b9b618fbbc3b494a896a9d074b74e414337 (diff) | |
| download | mariadb-git-abf9d35213ba482a3927651ddb98baa47aeb34fd.tar.gz | |
Merge branch 'mysql/5.5' into 5.5
Diffstat (limited to 'sql/sql_reload.cc')
| -rw-r--r-- | sql/sql_reload.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_reload.cc b/sql/sql_reload.cc index 914b9026014..b9328addc6a 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 @@ -26,6 +26,7 @@ #include "sql_repl.h" // reset_master, reset_slave #include "rpl_mi.h" // Master_info::data_lock #include "debug_sync.h" +#include "des_key_file.h" static void disable_checkpoints(THD *thd); @@ -301,7 +302,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)) |