diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-03-06 17:20:37 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-03-06 17:20:37 +0100 |
| commit | 0bacc397742c094c8f74ea7354cae4143afb2bb6 (patch) | |
| tree | a668e2d0f585a3668d146f79af16f7354d90a219 /libmariadb | |
| parent | c532e236710f582b4b51427e850be4ad66ebe2da (diff) | |
Without threads for the while
Change-Id: I15ad587b510ab006a6b92270f51ce8c352312694
Diffstat (limited to 'libmariadb')
| -rw-r--r-- | libmariadb/StaticLibrary_mariadb.mk | 4 | ||||
| -rw-r--r-- | libmariadb/UnpackedTarball_mariadb.mk | 6 | ||||
| -rw-r--r-- | libmariadb/mariadb-thread.patch | 12 |
3 files changed, 18 insertions, 4 deletions
diff --git a/libmariadb/StaticLibrary_mariadb.mk b/libmariadb/StaticLibrary_mariadb.mk index 3a22433a81ff..2f70dcbb5f51 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 2f5c8cba7cc3..499ce70ba832 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 000000000000..997929f9eb28 --- /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; |