diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-29 22:17:00 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-29 22:17:00 +0300 |
| commit | f98bb23168ee9bc0da8aa7111f35cf2539986387 (patch) | |
| tree | b7e9c3dc28e9d1fd82eebea077f3ca0aac640218 /sql/mysqld.h | |
| parent | e35676f5557d68c7b51ba47aa73dcdf72eafa436 (diff) | |
| parent | e99ed820d790617a029b03d9c4ab437c246c956a (diff) | |
| download | mariadb-git-f98bb23168ee9bc0da8aa7111f35cf2539986387.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index b6d2d688809..a29ca9ef8fe 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 @@ -613,10 +613,10 @@ extern mysql_mutex_t LOCK_item_func_sleep, LOCK_status, LOCK_error_log, LOCK_delayed_insert, LOCK_short_uuid_generator, LOCK_delayed_status, LOCK_delayed_create, LOCK_crypt, LOCK_timezone, - LOCK_active_mi, LOCK_manager, - LOCK_global_system_variables, LOCK_user_conn, + 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_global_system_variables; extern mysql_rwlock_t LOCK_all_status_vars; extern mysql_mutex_t LOCK_start_thread; #ifdef HAVE_OPENSSL |