summaryrefslogtreecommitdiff
path: root/mysys/my_init.c
diff options
context:
space:
mode:
authorStaale Smedseng <staale.smedseng@sun.com>2009-12-12 19:11:25 +0100
committerStaale Smedseng <staale.smedseng@sun.com>2009-12-12 19:11:25 +0100
commit983770aa6aaa3ce7a231a80472e0ebb7095c9f86 (patch)
treee11d1534328b91e686c5a4590990a39cf3e6eeb6 /mysys/my_init.c
parent33aa8f59e26eb95f13bf059537f636785c1f68fd (diff)
downloadmariadb-git-983770aa6aaa3ce7a231a80472e0ebb7095c9f86.tar.gz
Bug #45058 init_available_charsets uses double checked locking
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().
Diffstat (limited to 'mysys/my_init.c')
-rw-r--r--mysys/my_init.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c
index a60927be693..453c72f999f 100644
--- a/mysys/my_init.c
+++ b/mysys/my_init.c
@@ -165,7 +165,6 @@ void my_end(int infoflag)
my_print_open_files();
}
}
- free_charsets();
my_error_unregister_all();
my_once_free();