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 /extra | |
| parent | 8317ce73d448134a1c8c4a85fbe293b329a5593a (diff) | |
| parent | 446b3d356218bff06efe4b3f5df89595cdfe8284 (diff) | |
| download | mariadb-git-6d390bab4a0695fedeead35e78111e1033f7b3df.tar.gz | |
Merge 10.2 into bb-10.2-ext
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index 016ddb6c60f..338706b3113 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -5070,7 +5070,7 @@ handle_options(int argc, char **argv, char ***argv_client, char ***argv_server) setup_error_messages(); sys_var_init(); plugin_mutex_init(); - mysql_rwlock_init(key_rwlock_LOCK_system_variables_hash, &LOCK_system_variables_hash); + mysql_prlock_init(key_rwlock_LOCK_system_variables_hash, &LOCK_system_variables_hash); opt_stack_trace = 1; test_flags |= TEST_SIGINT; init_signals(); |