diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-05-26 22:20:37 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-05-26 22:20:37 +0300 |
| commit | 2d43ff67ddab70e6fb89682e201cb788c845e71e (patch) | |
| tree | fb2bfae7fb5bfbeccb2c0a3681cbd16e7044e8fc /storage/pbxt | |
| parent | 4aa9d903c11554cc4887eeffe7f0592c52e8bc99 (diff) | |
| download | mariadb-git-2d43ff67ddab70e6fb89682e201cb788c845e71e.tar.gz | |
Resolve bzr conflicts
storage/pbxt/src/ha_pbxt.cc:
LOCK_plugin is not locked anymore as part of plugin initialization
Diffstat (limited to 'storage/pbxt')
| -rw-r--r-- | storage/pbxt/src/ha_pbxt.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/storage/pbxt/src/ha_pbxt.cc b/storage/pbxt/src/ha_pbxt.cc index 0a76239b177..e8ce200ce0f 100644 --- a/storage/pbxt/src/ha_pbxt.cc +++ b/storage/pbxt/src/ha_pbxt.cc @@ -1250,7 +1250,7 @@ static int pbxt_init(void *p) * Only real problem, 2 threads try to load the same * plugin at the same time. */ -#if MYSQL_VERSION_ID < 60014 && (!defined(MARIADB_BASE_VERSION) || MYSQL_VERSION_ID < 50146) +#if MYSQL_VERSION_ID <= 50146 myxt_mutex_unlock(&LOCK_plugin); #endif #endif @@ -1286,11 +1286,9 @@ static int pbxt_init(void *p) if (thd) myxt_destroy_thread(thd, FALSE); -#ifndef DRIZZLED -#if MYSQL_VERSION_ID < 60014 && (!defined(MARIADB_BASE_VERSION) || MYSQL_VERSION_ID < 50146) +#if MYSQL_VERSION_ID <= 50146 && !defined(DRIZZLED) myxt_mutex_lock(&LOCK_plugin); #endif -#endif } #endif } |