diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-12-13 00:10:40 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-12-13 00:10:40 +0100 |
| commit | 162399515813a4e23c8735473f9d2dd622a6679b (patch) | |
| tree | 39077fdabea60983c59899ce3d28e84c4d97c7e6 /sql/mysqld.h | |
| parent | 5908d7ebb81bc2d52c67e519a4643372cb9f08bd (diff) | |
| parent | 0ed474484c037a32bea32abaecd3ff770f40bd49 (diff) | |
| download | mariadb-git-162399515813a4e23c8735473f9d2dd622a6679b.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index 51e468294a7..673ef71cb7a 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -1,4 +1,5 @@ -/* Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2006, 2015, Oracle and/or its affiliates. + Copyright (c) 2010, 2015, MariaDB 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 @@ -532,6 +533,7 @@ extern mysql_mutex_t LOCK_slave_init; extern MYSQL_PLUGIN_IMPORT mysql_mutex_t LOCK_thread_count; #ifdef HAVE_OPENSSL +extern char* des_key_file; extern mysql_mutex_t LOCK_des_key_file; #endif extern mysql_mutex_t LOCK_server_started; |