database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '5.5' into 10.0

Browse Source
This commit is contained in:
Sergei Golubchik
2015-12-13 00:10:40 +01:00
parent 5908d7ebb8 0ed474484c
commit 1623995158
80 changed files with 1022 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_reload.cc
View File

@ -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);
@ -334,7 +334,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))