database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Bug#42649 THR_LOCK_charset global mutex abused by InnoDB

Browse Source 
The patch was originally proposed by Mikael and reviewed by Bar.
This commit is contained in:
Alexander Barkov
2009-04-07 11:48:38 +05:00
parent e0d74efd85
commit 5847be8c9a
1 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
mysys/charset.c
View File

@@ -494,29 +494,40 @@ static CHARSET_INFO *get_internal_charset(uint cs_number, myf flags)
{ {
char buf[FN_REFLEN]; char buf[FN_REFLEN];
CHARSET_INFO *cs; CHARSET_INFO *cs;
/*
To make things thread safe we are not allowing other threads to interfere
while we may changing the cs_info_table
*/
pthread_mutex_lock(&THR_LOCK_charset);
if ((cs= all_charsets[cs_number])) if ((cs= all_charsets[cs_number]))
{ {
if (!(cs->state & MY_CS_COMPILED) && !(cs->state & MY_CS_LOADED)) if (cs->state & MY_CS_READY) /* if CS is already initialized */
return cs;
/*
To make things thread safe we are not allowing other threads to interfere
while we may changing the cs_info_table
*/
pthread_mutex_lock(&THR_LOCK_charset);
if (!(cs->state & (MY_CS_COMPILED|MY_CS_LOADED))) /* if CS is not in memory */
{ {
strxmov(get_charsets_dir(buf), cs->csname, ".xml", NullS); strxmov(get_charsets_dir(buf), cs->csname, ".xml", NullS);
my_read_charset_file(buf,flags); my_read_charset_file(buf,flags);
} }
cs= (cs->state & MY_CS_AVAILABLE) ? cs : NULL;
} if (cs->state & MY_CS_AVAILABLE)
if (cs && !(cs->state & MY_CS_READY)) {
{ if (!(cs->state & MY_CS_READY))
if ((cs->cset->init && cs->cset->init(cs, cs_alloc)) || {
(cs->coll->init && cs->coll->init(cs, cs_alloc))) if ((cs->cset->init && cs->cset->init(cs, cs_alloc)) ||
cs= NULL; (cs->coll->init && cs->coll->init(cs, cs_alloc)))
cs= NULL;
else
cs->state|= MY_CS_READY;
}
}
else else
cs->state|= MY_CS_READY; cs= NULL;
pthread_mutex_unlock(&THR_LOCK_charset);
} }
pthread_mutex_unlock(&THR_LOCK_charset);
return cs; return cs;
} }