mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
8969530cff
As documented in the bug report, the double checked locking pattern has inherent issues, and cannot guarantee correct initialization. This patch replaces the logic in init_available_charsets() with the use of pthread_once(3). A wrapper function, my_pthread_once(), is introduced and is used in lieu of direct calls to init_available_charsets(). Related defines MY_PTHREAD_ONCE_* are also introduced. For the Windows platform, the implementation in lp:sysbench is ported. For single-thread use, a simple define calls the function and sets the pthread_once control variable. Charset initialization is modified to use my_pthread_once(). include/my_no_pthread.h: Dummy my_pthread_once() for single thread use. include/my_pthread.h: Declaration for new function my_pthread_once(). mysys/charset.c: Logic in init_available_charsets() is simplified. Using my_pthread_once() for all calls to this func. mysys/my_winthread.c: Windows implementation of my_pthread_once().
38 lines
1.4 KiB
C
38 lines
1.4 KiB
C
/*
|
|
Copyright (c) 2002 Novell, Inc. All Rights Reserved.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
#include "my_global.h"
|
|
|
|
void init_available_charsets(void);
|
|
|
|
/* this function is required so that global memory is allocated against this
|
|
library nlm, and not against a paticular client */
|
|
int _NonAppStart(void *NLMHandle, void *errorScreen, const char *commandLine,
|
|
const char *loadDirPath, size_t uninitializedDataLength,
|
|
void *NLMFileHandle, int (*readRoutineP)( int conn, void *fileHandle,
|
|
size_t offset, size_t nbytes, size_t *bytesRead, void *buffer ),
|
|
size_t customDataOffset, size_t customDataSize, int messageCount,
|
|
const char **messages)
|
|
{
|
|
mysql_server_init(0, NULL, NULL);
|
|
|
|
init_available_charsets();
|
|
|
|
return 0;
|
|
}
|
|
|