diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-30 20:18:25 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-30 20:18:25 +0200 |
| commit | 6d390bab4a0695fedeead35e78111e1033f7b3df (patch) | |
| tree | d02c2b38010ca61adb829a45df3e1051463300a8 /sql/mysqld.h | |
| parent | 8317ce73d448134a1c8c4a85fbe293b329a5593a (diff) | |
| parent | 446b3d356218bff06efe4b3f5df89595cdfe8284 (diff) | |
| download | mariadb-git-6d390bab4a0695fedeead35e78111e1033f7b3df.tar.gz | |
Merge 10.2 into bb-10.2-ext
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index ed6685828ba..57698dc5d9b 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -585,7 +585,7 @@ extern mysql_mutex_t LOCK_des_key_file; extern mysql_mutex_t LOCK_server_started; extern mysql_cond_t COND_server_started; extern mysql_rwlock_t LOCK_grant, LOCK_sys_init_connect, LOCK_sys_init_slave; -extern mysql_rwlock_t LOCK_system_variables_hash; +extern mysql_prlock_t LOCK_system_variables_hash; extern mysql_cond_t COND_thread_count, COND_start_thread; extern mysql_cond_t COND_manager; extern mysql_cond_t COND_slave_background; |