diff options
| author | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-03-16 13:37:13 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-03-16 13:37:13 +0300 |
| commit | 15baa13f84b9880eb9217a3c3b4f19c51bdfaf2d (patch) | |
| tree | d8831432063fa4577460a57a59e8f5bcfeabbff7 /sql/sql_plugin.cc | |
| parent | 0fd7a359da836ab3233023dcd1b7c6ab09c90be6 (diff) | |
| parent | f7cf8e57c12f435980bafb4f4b9c657a722345a4 (diff) | |
| download | mariadb-git-15baa13f84b9880eb9217a3c3b4f19c51bdfaf2d.tar.gz | |
Manual merge of patch for bug #40552 into the team tree.
Replaced a call to load_defaults() in sql_plugin.cc with
its thread-safe version.
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 223ba6ef42e..1465b6d2d30 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -1652,7 +1652,7 @@ bool mysql_install_plugin(THD *thd, const LEX_STRING *name, const LEX_STRING *dl pthread_mutex_lock(&LOCK_plugin); rw_wrlock(&LOCK_system_variables_hash); - load_defaults(MYSQL_CONFIG_NAME, load_default_groups, &argc, &argv); + my_load_defaults(MYSQL_CONFIG_NAME, load_default_groups, &argc, &argv, NULL); error= plugin_add(thd->mem_root, name, dl, &argc, argv, REPORT_TO_USER); if (argv) free_defaults(argv); |