database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Resolve bzr conflicts

Browse Source 
storage/pbxt/src/ha_pbxt.cc:
  LOCK_plugin is not locked anymore as part of plugin initialization
This commit is contained in:
Michael Widenius
2010-05-26 22:20:37 +03:00
parent 4aa9d903c1
commit 2d43ff67dd
2 changed files with 50 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
mysql-test/suite/innodb/r/innodb-use-sys-malloc.result Normal file
View File

@@ -0,0 +1,48 @@
SELECT @@GLOBAL.innodb_use_sys_malloc;
@@GLOBAL.innodb_use_sys_malloc
1
1 Expected
SET @@GLOBAL.innodb_use_sys_malloc=0;
ERROR HY000: Variable 'innodb_use_sys_malloc' is a read only variable
Expected error 'Read only variable'
SELECT @@GLOBAL.innodb_use_sys_malloc;
@@GLOBAL.innodb_use_sys_malloc
1
1 Expected
drop table if exists t1;
create table t1(a int not null) engine=innodb DEFAULT CHARSET=latin1;
insert into t1 values (1),(2),(3),(4),(5),(6),(7);
select * from t1;
a
1
2
3
4
5
6
7
drop table t1;
SELECT @@GLOBAL.innodb_use_sys_malloc;
@@GLOBAL.innodb_use_sys_malloc
1
1 Expected
SET @@GLOBAL.innodb_use_sys_malloc=0;
ERROR HY000: Variable 'innodb_use_sys_malloc' is a read only variable
Expected error 'Read only variable'
SELECT @@GLOBAL.innodb_use_sys_malloc;
@@GLOBAL.innodb_use_sys_malloc
1
1 Expected
drop table if exists t1;
create table t1(a int not null) engine=innodb DEFAULT CHARSET=latin1;
insert into t1 values (1),(2),(3),(4),(5),(6),(7);
select * from t1;
a
1
2
3
4
5
6
7
drop table t1;

6
storage/pbxt/src/ha_pbxt.cc
View File

@@ -1250,7 +1250,7 @@ static int pbxt_init(void *p)
* Only real problem, 2 threads try to load the same * Only real problem, 2 threads try to load the same
* plugin at the same time. * 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); myxt_mutex_unlock(&LOCK_plugin);
#endif #endif
#endif #endif
@@ -1286,10 +1286,8 @@ static int pbxt_init(void *p)
if (thd) if (thd)
myxt_destroy_thread(thd, FALSE); myxt_destroy_thread(thd, FALSE);
#ifndef DRIZZLED #if MYSQL_VERSION_ID <= 50146 && !defined(DRIZZLED)
#if MYSQL_VERSION_ID < 60014 && (!defined(MARIADB_BASE_VERSION) || MYSQL_VERSION_ID < 50146)
myxt_mutex_lock(&LOCK_plugin); myxt_mutex_lock(&LOCK_plugin);
#endif
#endif #endif
} }
#endif #endif