diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-02 02:22:16 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-02 02:22:16 +0300 |
| commit | 665100b69dfebe45e2d3b68116c6718560bf63b2 (patch) | |
| tree | a19075577cf795c631e5ac514d6dac52880f9b86 /sql/sql_plugin.cc | |
| parent | 5eed6cc55db0f99aff7845397a824fb2f5ef069e (diff) | |
| parent | 4e8d1c6bf30abfd45a993b058ff2a33d4671b73d (diff) | |
| download | mariadb-git-665100b69dfebe45e2d3b68116c6718560bf63b2.tar.gz | |
Merge next-mr -> next-4284.
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index c5449a1dde4..28fd3581829 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -1368,10 +1368,10 @@ static void plugin_load(MEM_ROOT *tmp_root, int *argc, char **argv) When building an embedded library, if the mysql.plugin table does not exist, we silently ignore the missing table */ - pthread_mutex_lock(&LOCK_open); + mysql_mutex_lock(&LOCK_open); if (check_if_table_exists(new_thd, &tables, &table_exists)) table_exists= FALSE; - pthread_mutex_unlock(&LOCK_open); + mysql_mutex_unlock(&LOCK_open); if (!table_exists) goto end; #endif /* EMBEDDED_LIBRARY */ |