[Libreoffice-commits] core.git: libmariadb/mariadb-thread.patch libmariadb/StaticLibrary_mariadb.mk libmariadb/UnpackedTarball_mariadb.mk

[Fridrich Å trba]

 libmariadb/StaticLibrary_mariadb.mk   |    4 ----
 libmariadb/UnpackedTarball_mariadb.mk |    6 ++++++
 libmariadb/mariadb-thread.patch       |   12 ++++++++++++
 3 files changed, 18 insertions(+), 4 deletions(-)

New commits:
commit 0bacc397742c094c8f74ea7354cae4143afb2bb6
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Mar 6 17:20:37 2013 +0100

    Without threads for the while
    
    Change-Id: I15ad587b510ab006a6b92270f51ce8c352312694

diff --git a/libmariadb/StaticLibrary_mariadb.mk b/libmariadb/StaticLibrary_mariadb.mk
index 3a22433..2f70dcb 100644
--- a/libmariadb/StaticLibrary_mariadb.mk
+++ b/libmariadb/StaticLibrary_mariadb.mk
@@ -22,10 +22,6 @@ $(eval $(call gb_StaticLibrary_set_include,mariadblib,\
 	-I$(call gb_UnpackedTarball_get_dir,mariadb)/include \
 ))
 
-$(eval $(call gb_StaticLibrary_add_defs,mariadblib,\
-	-DTHREAD \
-))
-
 $(eval $(call gb_StaticLibrary_add_generated_cobjects,mariadblib,\
     UnpackedTarball/mariadb/libmysql/array \
     UnpackedTarball/mariadb/libmysql/bchange \
diff --git a/libmariadb/UnpackedTarball_mariadb.mk b/libmariadb/UnpackedTarball_mariadb.mk
index 2f5c8cb..499ce70 100644
--- a/libmariadb/UnpackedTarball_mariadb.mk
+++ b/libmariadb/UnpackedTarball_mariadb.mk
@@ -17,4 +17,10 @@ $(eval $(call gb_UnpackedTarball_add_file,mariadb,include/my_config.h,libmariadb
 
 $(eval $(call gb_UnpackedTarball_add_file,mariadb,include/mysql_version.h,libmariadb/mysql_version.h))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,mariadb,1))
+
+$(eval $(call gb_UnpackedTarball_add_patches,mariadb,\
+    libmariadb/mariadb-thread.patch \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/libmariadb/mariadb-thread.patch b/libmariadb/mariadb-thread.patch
new file mode 100644
index 0000000..997929f
--- /dev/null
+++ b/libmariadb/mariadb-thread.patch
@@ -0,0 +1,12 @@
+--- mariadb/libmysql/client_plugin.c	2013-03-06 17:06:42.548905989 +0100
++++ mariadb/libmysql/client_plugin.c	2013-03-06 17:14:29.721588964 +0100
+@@ -175,7 +175,9 @@
+     goto err2;
+   }
+ 
++#ifdef THREAD
+   safe_mutex_assert_owner(&LOCK_load_client_plugin);
++#endif
+ 
+   p->next= plugin_list[plugin->type];
+   plugin_list[plugin->type]= p;