diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-28 15:56:24 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-28 15:56:24 +0300 |
| commit | d59e15bdb96bd24dadaed39bba25fcb0c0bbf8f4 (patch) | |
| tree | f371cddd0134ed01964b7b3e051d890b2cec20f1 /sql/mysqld.h | |
| parent | 88157247fc5920ef77cfa96aebd33460d86b3905 (diff) | |
| parent | 8358c6f03edb941be488f009c2bd0eb9df47e8c5 (diff) | |
| download | mariadb-git-d59e15bdb96bd24dadaed39bba25fcb0c0bbf8f4.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index 8faac6f6f5d..26229c8cc5d 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -1,5 +1,5 @@ /* Copyright (c) 2006, 2016, Oracle and/or its affiliates. - Copyright (c) 2010, 2017, MariaDB Corporation. + Copyright (c) 2010, 2019, MariaDB Corporation. 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 @@ -566,11 +566,11 @@ extern mysql_mutex_t LOCK_item_func_sleep, LOCK_status, LOCK_show_status, LOCK_error_log, LOCK_delayed_insert, LOCK_short_uuid_generator, LOCK_delayed_status, LOCK_delayed_create, LOCK_crypt, LOCK_timezone, - LOCK_slave_list, LOCK_active_mi, LOCK_manager, - LOCK_global_system_variables, LOCK_user_conn, + LOCK_slave_list, LOCK_active_mi, LOCK_manager, LOCK_user_conn, LOCK_prepared_stmt_count, LOCK_error_messages, LOCK_connection_count, LOCK_slave_background; -extern MYSQL_PLUGIN_IMPORT mysql_mutex_t LOCK_thread_count; +extern MYSQL_PLUGIN_IMPORT mysql_mutex_t LOCK_thread_count, + LOCK_global_system_variables; extern mysql_mutex_t LOCK_start_thread; #ifdef HAVE_OPENSSL extern char* des_key_file; |