From 784b9604427bf4679398e1a310b7ff288ded587b Mon Sep 17 00:00:00 2001 From: Alex Dupre Date: Tue, 11 Jan 2011 20:33:38 +0000 Subject: Remove any attempts to create a libmysqlclient not linked to a threading library. Restore previous libraries location. These two changes should fix most of the reported errors. Feature safe: yes --- databases/mysql55-server/files/patch-include_my_pthread.h | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 databases/mysql55-server/files/patch-include_my_pthread.h (limited to 'databases/mysql55-server/files/patch-include_my_pthread.h') diff --git a/databases/mysql55-server/files/patch-include_my_pthread.h b/databases/mysql55-server/files/patch-include_my_pthread.h deleted file mode 100644 index bcca323e3931..000000000000 --- a/databases/mysql55-server/files/patch-include_my_pthread.h +++ /dev/null @@ -1,14 +0,0 @@ ---- include/my_pthread.h.orig 2011-01-09 10:17:18.000000000 +0100 -+++ include/my_pthread.h 2011-01-09 12:06:33.000000000 +0100 -@@ -215,7 +215,10 @@ - - #define my_pthread_once_t pthread_once_t - #define MY_PTHREAD_ONCE_INIT PTHREAD_ONCE_INIT --#define my_pthread_once(C,F) pthread_once(C,F) -+#define my_pthread_once(C,F) do { \ -+ if (__isthreaded) pthread_once(C,F); \ -+ else if ((C)->state == PTHREAD_NEEDS_INIT) { F(); (C)->state = PTHREAD_DONE_INIT; } \ -+ } while(0) - - /* Test first for RTS or FSU threads */ - -- cgit v1.2.3