update libmariadb to bzr revision 101

Change-Id: I98b7442aa9843f206549ad7c5a2ae141b70b1542

external/libmariadb/README

+Update to new upstream bzr snapshot:
+
+Don't use 'bzr diff', it will not put renames in the diff in a way
+that patch understands.
+
+bzr -Ossl.cert_reqs=none branch lp:mariadb-native-client
+mv mariadb-native-client mariadb-native-client.trunk
+cp -R mariadb-native-client.trunk mariadb-native-client.release
+cd mariadb-native-client.release
+bzr revert -r mariadb-native-client-1.0.0
+cd ..
+diff -x .bzr -u --recursive -N mariadb-native-client.release/ mariadb-native-client.trunk/  > /path/to/libreoffice_tree/libmariadb/mariadb-trunk-NNN.patch
+sed -i -e 's@^\([+-]\{3\} \)mariadb-native-client.\(trunk\|release\)/@\1mariadb/@' /path/to/libreoffice_tree/libmariadb/mariadb-trunk-NNN.patch
+dos2unix -f /path/to/libreoffice_tree/libmariadb/mariadb-trunk-NNN.patch
+
+regenerate configs
\ No newline at end of file

external/libmariadb/StaticLibrary_mariadb.mk

@@ -21,94 +21,92 @@ $(eval $(call gb_StaticLibrary_set_include,mariadblib,\
 # This is needed for MSVC 2008: it somehow finds a dlopen somewhere
 # but the static library then contains unreferenced symbols.
 # This macro enables a re-definition to native Win32 APIs in my_global.h.
-$(eval $(call gb_StaticLibrary_add_cflags,mariadblib,-DHAVE_DLOPEN))
+## TODO missing enable: -DHAVE_OPENSSL -D HAVE_COMPRESS
+## (but then need to add "-lssl -lcrypto -lz" to mysqlcppconn linking)
+$(eval $(call gb_StaticLibrary_add_cflags,mariadblib,-DHAVE_DLOPEN -D ENABLED_LOCAL_INFILE -D LIBMARIADB -D THREAD -DSQLITE_ENABLE_COLUMN_METADATA=1))
 
 $(eval $(call gb_StaticLibrary_add_generated_cobjects,mariadblib,\
-    UnpackedTarball/mariadb/libmysql/array \
-    UnpackedTarball/mariadb/libmysql/bchange \
-    UnpackedTarball/mariadb/libmysql/bmove \
-    UnpackedTarball/mariadb/libmysql/bmove_upp \
-    UnpackedTarball/mariadb/libmysql/charset \
-    UnpackedTarball/mariadb/libmysql/client_plugin \
-    UnpackedTarball/mariadb/libmysql/dbug \
-    UnpackedTarball/mariadb/libmysql/default \
-    UnpackedTarball/mariadb/libmysql/errmsg \
-    UnpackedTarball/mariadb/libmysql/errors \
-    UnpackedTarball/mariadb/libmysql/getopt \
-    UnpackedTarball/mariadb/libmysql/getopt1 \
-    UnpackedTarball/mariadb/libmysql/get_password \
-    UnpackedTarball/mariadb/libmysql/int2str \
-    UnpackedTarball/mariadb/libmysql/is_prefix \
-    UnpackedTarball/mariadb/libmysql/libmysql \
-    UnpackedTarball/mariadb/libmysql/list \
-    UnpackedTarball/mariadb/libmysql/llstr \
-    UnpackedTarball/mariadb/libmysql/longlong2str \
-    UnpackedTarball/mariadb/libmysql/mf_dirname \
-    UnpackedTarball/mariadb/libmysql/mf_fn_ext \
-    UnpackedTarball/mariadb/libmysql/mf_format \
-    UnpackedTarball/mariadb/libmysql/mf_loadpath \
-    UnpackedTarball/mariadb/libmysql/mf_pack \
-    UnpackedTarball/mariadb/libmysql/mf_path \
-    UnpackedTarball/mariadb/libmysql/mf_tempfile \
-    UnpackedTarball/mariadb/libmysql/mf_unixpath \
-    UnpackedTarball/mariadb/libmysql/mf_wcomp \
-    UnpackedTarball/mariadb/libmysql/mulalloc \
-    UnpackedTarball/mariadb/libmysql/my_alloc \
-    UnpackedTarball/mariadb/libmysql/my_auth \
-    UnpackedTarball/mariadb/libmysql/my_charset \
-    UnpackedTarball/mariadb/libmysql/my_compress \
-    UnpackedTarball/mariadb/libmysql/my_create \
-    UnpackedTarball/mariadb/libmysql/my_delete \
-    UnpackedTarball/mariadb/libmysql/my_div \
-    UnpackedTarball/mariadb/libmysql/my_error \
-    UnpackedTarball/mariadb/libmysql/my_fopen \
-    UnpackedTarball/mariadb/libmysql/my_fstream \
-    UnpackedTarball/mariadb/libmysql/my_gethostbyname \
-    UnpackedTarball/mariadb/libmysql/my_getwd \
-    UnpackedTarball/mariadb/libmysql/my_init \
-    UnpackedTarball/mariadb/libmysql/my_lib \
-    UnpackedTarball/mariadb/libmysql/my_loaddata \
-    UnpackedTarball/mariadb/libmysql/my_malloc \
-    UnpackedTarball/mariadb/libmysql/my_messnc \
-    UnpackedTarball/mariadb/libmysql/my_net \
-    UnpackedTarball/mariadb/libmysql/my_once \
-    UnpackedTarball/mariadb/libmysql/my_open \
-    UnpackedTarball/mariadb/libmysql/my_port \
-    UnpackedTarball/mariadb/libmysql/my_pthread \
-    UnpackedTarball/mariadb/libmysql/my_read \
-    UnpackedTarball/mariadb/libmysql/my_realloc \
-    UnpackedTarball/mariadb/libmysql/my_secure \
-    UnpackedTarball/mariadb/libmysql/my_seek \
-    UnpackedTarball/mariadb/libmysql/my_static \
-    UnpackedTarball/mariadb/libmysql/my_stmt \
-    UnpackedTarball/mariadb/libmysql/my_stmt_codec \
-    UnpackedTarball/mariadb/libmysql/my_symlink \
-    UnpackedTarball/mariadb/libmysql/my_thr_init \
-    UnpackedTarball/mariadb/libmysql/my_vsnprintf \
-    UnpackedTarball/mariadb/libmysql/my_write \
-    UnpackedTarball/mariadb/libmysql/net \
-    UnpackedTarball/mariadb/libmysql/password \
-    UnpackedTarball/mariadb/libmysql/safemalloc \
-    UnpackedTarball/mariadb/libmysql/sha1 \
-    UnpackedTarball/mariadb/libmysql/str2int \
-    UnpackedTarball/mariadb/libmysql/strcend \
-    UnpackedTarball/mariadb/libmysql/strcont \
-    UnpackedTarball/mariadb/libmysql/strend \
-    UnpackedTarball/mariadb/libmysql/strfill \
-    UnpackedTarball/mariadb/libmysql/string \
-    UnpackedTarball/mariadb/libmysql/strinstr \
-    UnpackedTarball/mariadb/libmysql/strmake \
-    UnpackedTarball/mariadb/libmysql/strmov \
-    UnpackedTarball/mariadb/libmysql/strnlen \
-    UnpackedTarball/mariadb/libmysql/strnmov \
-    UnpackedTarball/mariadb/libmysql/strto \
-    UnpackedTarball/mariadb/libmysql/strtoll \
-    UnpackedTarball/mariadb/libmysql/strtoull \
-    UnpackedTarball/mariadb/libmysql/strxmov \
-    UnpackedTarball/mariadb/libmysql/strxnmov \
-    UnpackedTarball/mariadb/libmysql/thr_mutex \
-    UnpackedTarball/mariadb/libmysql/typelib \
-    UnpackedTarball/mariadb/libmysql/violite \
+	UnpackedTarball/mariadb/libmariadb/array \
+	UnpackedTarball/mariadb/libmariadb/ma_dyncol \
+	UnpackedTarball/mariadb/libmariadb/bchange \
+	UnpackedTarball/mariadb/libmariadb/bmove \
+	UnpackedTarball/mariadb/libmariadb/bmove_upp \
+	UnpackedTarball/mariadb/libmariadb/my_charset \
+	UnpackedTarball/mariadb/libmariadb/hash \
+	UnpackedTarball/mariadb/libmariadb/violite \
+	UnpackedTarball/mariadb/libmariadb/net \
+	UnpackedTarball/mariadb/libmariadb/charset \
+	UnpackedTarball/mariadb/libmariadb/ma_time \
+	UnpackedTarball/mariadb/libmariadb/dbug \
+	UnpackedTarball/mariadb/libmariadb/default \
+	UnpackedTarball/mariadb/libmariadb/errmsg \
+	UnpackedTarball/mariadb/libmariadb/my_vsnprintf \
+	UnpackedTarball/mariadb/libmariadb/errors \
+	UnpackedTarball/mariadb/libmariadb/getopt1 \
+	UnpackedTarball/mariadb/libmariadb/getopt \
+	UnpackedTarball/mariadb/libmariadb/get_password \
+	UnpackedTarball/mariadb/libmariadb/int2str \
+	UnpackedTarball/mariadb/libmariadb/is_prefix \
+	UnpackedTarball/mariadb/libmariadb/libmariadb \
+	UnpackedTarball/mariadb/libmariadb/list \
+	UnpackedTarball/mariadb/libmariadb/llstr \
+	UnpackedTarball/mariadb/libmariadb/longlong2str \
+	UnpackedTarball/mariadb/libmariadb/mf_dirname \
+	UnpackedTarball/mariadb/libmariadb/mf_fn_ext \
+	UnpackedTarball/mariadb/libmariadb/mf_format \
+	UnpackedTarball/mariadb/libmariadb/mf_loadpath \
+	UnpackedTarball/mariadb/libmariadb/mf_pack \
+	UnpackedTarball/mariadb/libmariadb/mf_path \
+	UnpackedTarball/mariadb/libmariadb/mf_unixpath \
+	UnpackedTarball/mariadb/libmariadb/mf_wcomp \
+	UnpackedTarball/mariadb/libmariadb/mulalloc \
+	UnpackedTarball/mariadb/libmariadb/my_alloc \
+	UnpackedTarball/mariadb/libmariadb/my_compress \
+	UnpackedTarball/mariadb/libmariadb/my_div \
+	UnpackedTarball/mariadb/libmariadb/my_error \
+	UnpackedTarball/mariadb/libmariadb/my_fopen \
+	UnpackedTarball/mariadb/libmariadb/my_fstream \
+	UnpackedTarball/mariadb/libmariadb/my_getwd \
+	UnpackedTarball/mariadb/libmariadb/my_init \
+	UnpackedTarball/mariadb/libmariadb/my_lib \
+	UnpackedTarball/mariadb/libmariadb/my_malloc \
+	UnpackedTarball/mariadb/libmariadb/my_messnc \
+	UnpackedTarball/mariadb/libmariadb/my_net \
+	UnpackedTarball/mariadb/libmariadb/my_once \
+	UnpackedTarball/mariadb/libmariadb/my_open \
+	UnpackedTarball/mariadb/libmariadb/my_port \
+	UnpackedTarball/mariadb/libmariadb/my_pthread \
+	UnpackedTarball/mariadb/libmariadb/my_read \
+	UnpackedTarball/mariadb/libmariadb/my_realloc \
+	UnpackedTarball/mariadb/libmariadb/my_seek \
+	UnpackedTarball/mariadb/libmariadb/my_static \
+	UnpackedTarball/mariadb/libmariadb/my_symlink \
+	UnpackedTarball/mariadb/libmariadb/my_thr_init \
+	UnpackedTarball/mariadb/libmariadb/my_write \
+	UnpackedTarball/mariadb/libmariadb/password \
+	UnpackedTarball/mariadb/libmariadb/str2int \
+	UnpackedTarball/mariadb/libmariadb/strcend \
+	UnpackedTarball/mariadb/libmariadb/strcont \
+	UnpackedTarball/mariadb/libmariadb/strend \
+	UnpackedTarball/mariadb/libmariadb/strfill \
+	UnpackedTarball/mariadb/libmariadb/string \
+	UnpackedTarball/mariadb/libmariadb/strinstr \
+	UnpackedTarball/mariadb/libmariadb/strmake \
+	UnpackedTarball/mariadb/libmariadb/strmov \
+	UnpackedTarball/mariadb/libmariadb/strnmov \
+	UnpackedTarball/mariadb/libmariadb/strtoll \
+	UnpackedTarball/mariadb/libmariadb/strtoull \
+	UnpackedTarball/mariadb/libmariadb/strxmov \
+	UnpackedTarball/mariadb/libmariadb/strxnmov \
+	UnpackedTarball/mariadb/libmariadb/thr_mutex \
+	UnpackedTarball/mariadb/libmariadb/typelib \
+	UnpackedTarball/mariadb/libmariadb/sha1 \
+	UnpackedTarball/mariadb/libmariadb/my_stmt \
+	UnpackedTarball/mariadb/libmariadb/my_loaddata \
+	UnpackedTarball/mariadb/libmariadb/my_stmt_codec \
+	UnpackedTarball/mariadb/libmariadb/client_plugin \
+	UnpackedTarball/mariadb/libmariadb/my_auth \
+	UnpackedTarball/mariadb/libmariadb/ma_secure \
 ))
 
 # vim: set noet sw=4 ts=4:

external/libmariadb/UnpackedTarball_mariadb.mk

@@ -27,15 +27,9 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,mariadb,1))
 # <https://mariadb.atlassian.net/browse/CONC-18> "no external definition of
 # non-static inline local_thr_alarm in libmariadb/net.c":
 $(eval $(call gb_UnpackedTarball_add_patches,mariadb,\
-    external/libmariadb/mariadb-thread.patch \
     external/libmariadb/mariadb-swap.patch \
-    external/libmariadb/mariadb-trunk-40.patch \
-    external/libmariadb/mariadb-static-inline.patch \
+    external/libmariadb/mariadb-trunk-101.patch \
     external/libmariadb/mariadb-msvc.patch.1 \
 ))
 
-$(eval $(call gb_UnpackedTarball_fix_end_of_line,mariadb,\
-	libmysql/libmysql_exports.def \
-))
-
 # vim: set noet sw=4 ts=4:

external/libmariadb/configs/linux_my_config.h

 
-#define HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE 1
-
 /*
  * Include file constants (processed in LibmysqlIncludeFiles.txt 1
  */
@@ -60,7 +58,7 @@
 /* #undef HAVE_BFILL */
 /* #undef HAVE_BMOVE */
 #define HAVE_BZERO 1
-/* #undef HAVE_CLOCK_GETTIME */
+#define HAVE_CLOCK_GETTIME 1
 /* #undef HAVE_COMPRESS */
 /* #undef HAVE_CRYPT */
 #define HAVE_DLERROR 1
@@ -69,7 +67,7 @@
 #define HAVE_FCNTL 1
 /* #undef HAVE_FCONVERT */
 #define HAVE_FDATASYNC 1
-/* #undef HAVE_FESETROUND */
+#define HAVE_FESETROUND 1
 #define HAVE_FINITE 1
 #define HAVE_FSEEKO 1
 #define HAVE_FSYNC 1
@@ -91,7 +89,7 @@
 #define HAVE_INITGROUPS 1
 #define HAVE_LDIV 1
 #define HAVE_LOCALTIME_R 1
-/* #undef HAVE_LOG2 */
+#define HAVE_LOG2 1
 #define HAVE_LONGJMP 1
 #define HAVE_LSTAT 1
 #define HAVE_MADVISE 1
@@ -108,19 +106,19 @@
 #define HAVE_POLL 1
 #define HAVE_PREAD 1
 /* #undef HAVE_PTHREAD_ATTR_CREATE */
-/* #undef HAVE_PTHREAD_ATTR_GETSTACKSIZE */
+#define HAVE_PTHREAD_ATTR_GETSTACKSIZE 1
 /* #undef HAVE_PTHREAD_ATTR_SETPRIO */
 #define HAVE_PTHREAD_ATTR_SETSCHEDPARAM 1
 #define HAVE_PTHREAD_ATTR_SETSCOPE 1
-/* #undef HAVE_PTHREAD_ATTR_SETSTACKSIZE */
+#define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1
 /* #undef HAVE_PTHREAD_CONDATTR_CREATE */
 /* #undef HAVE_PTHREAD_INIT */
-/* #undef HAVE_PTHREAD_KEY_DELETE */
-/* #undef HAVE_PTHREAD_KILL */
-/* #undef HAVE_PTHREAD_RWLOCK_RDLOCK */
+#define HAVE_PTHREAD_KEY_DELETE 1
+#define HAVE_PTHREAD_KILL 1
+#define HAVE_PTHREAD_RWLOCK_RDLOCK 1
 /* #undef HAVE_PTHREAD_SETPRIO_NP */
 #define HAVE_PTHREAD_SETSCHEDPARAM 1
-/* #undef HAVE_PTHREAD_SIGMASK */
+#define HAVE_PTHREAD_SIGMASK 1
 /* #undef HAVE_PTHREAD_THREADMASK */
 /* #undef HAVE_PTHREAD_YIELD_NP */
 #define HAVE_READDIR_R 1
@@ -137,6 +135,7 @@
 #define HAVE_SIGWAIT 1
 #define HAVE_SLEEP 1
 #define HAVE_SNPRINTF 1
+/* #undef HAVE_SQLITE */
 #define HAVE_STPCPY 1
 #define HAVE_STRERROR 1
 /* #undef HAVE_STRLCPY */
@@ -160,127 +159,107 @@
  */
 /* Types we may use */
 #define SIZEOF_CHAR 1
-#ifdef SIZEOF_CHAR
+#if SIZEOF_CHAR
 # define HAVE_CHAR 1
 #endif
 
-#if defined(__x86_64__) || defined(__x86_64) || defined(__amd64__)
 #define SIZEOF_CHARP 8
-#else
-#define SIZEOF_CHARP 4
-#endif
-#ifdef SIZEOF_CHARP
+#if SIZEOF_CHARP
 # define HAVE_CHARP 1
 #endif
 
 #define SIZEOF_SHORT 2
-#ifdef SIZEOF_SHORT
+#if SIZEOF_SHORT
 # define HAVE_SHORT 1
 #endif
 
 #define SIZEOF_INT 4
-#ifdef SIZEOF_INT
+#if SIZEOF_INT
 # define HAVE_INT 1
 #endif
 
-#if defined(__x86_64__) || defined(__x86_64) || defined(__amd64__)
 #define SIZEOF_LONG 8
-#else
-#define SIZEOF_LONG 4
-#endif
-#ifdef SIZEOF_LONG
+#if SIZEOF_LONG
 # define HAVE_LONG 1
 #endif
 
 #define SIZEOF_LONG_LONG 8
-#ifdef SIZEOF_LONG_LONG
+#if SIZEOF_LONG_LONG
 # define HAVE_LONG_LONG 1
 #endif
 
-#if defined(__x86_64__) || defined(__x86_64) || defined(__amd64__)
 #define SIZEOF_OFF_T 8
-#else
-#define SIZEOF_OFF_T 4
-#endif
-#ifdef SIZEOF_OFF_T
+#if SIZEOF_OFF_T
 # define HAVE_OFF_T 1
 #endif
 
 #define SIZEOF_SIGSET_T 128
-#ifdef SIZEOF_SIGSET_T
+#if SIZEOF_SIGSET_T
 # define HAVE_SIGSET_T 1
 #endif
 
-#if defined(__x86_64__) || defined(__x86_64) || defined(__amd64__)
 #define SIZEOF_SIZE_T 8
-#else
-#define SIZEOF_SIZE_T 4
-#endif
-#ifdef SIZEOF_SIZE_T
+#if SIZEOF_SIZE_T
 # define HAVE_SIZE_T 1
 #endif
 
 /* #undef SIZEOF_UCHAR */
-#ifdef SIZEOF_UCHAR
+#if SIZEOF_UCHAR
 # define HAVE_UCHAR 1
 #endif
 
 #define SIZEOF_UINT 4
-#ifdef SIZEOF_UINT
+#if SIZEOF_UINT
 # define HAVE_UINT 1
 #endif
 
-#if defined(__x86_64__) || defined(__x86_64) || defined(__amd64__)
 #define SIZEOF_ULONG 8
-#else
-#define SIZEOF_ULONG 4
-#endif
-#ifdef SIZEOF_ULONG
+#if SIZEOF_ULONG
 # define HAVE_ULONG 1
 #endif
 
 /* #undef SIZEOF_INT8 */
-#ifdef SIZEOF_INT8
+#if SIZEOF_INT8
 # define HAVE_INT8 1
 #endif
 /* #undef SIZEOF_UINT8 */
-#ifdef SIZEOF_UINT8
+#if SIZEOF_UINT8
 # define HAVE_UINT8 1
 #endif
 
 /* #undef SIZEOF_INT16 */
-#ifdef SIZEOF_INT16
+#if SIZEOF_INT16
 # define HAVE_INT16 1
 #endif
 /* #undef SIZEOF_UINT16 */
-#ifdef SIZEOF_UINT16
+#if SIZEOF_UINT16
 # define HAVE_UINT16 1
 #endif
 
 /* #undef SIZEOF_INT32 */
-#ifdef SIZEOF_INT32
+#if SIZEOF_INT32
 # define HAVE_INT32 1
 #endif
 /* #undef SIZEOF_UINT32 */
-#ifdef SIZEOF_UINT32
+#if SIZEOF_UINT32
 # define HAVE_UINT32 1
 #endif
 /* #undef SIZEOF_U_INT32_T */
-#ifdef SIZEOF_U_INT32_T
+#if SIZEOF_U_INT32_T
 # define HAVE_U_INT32_T 1
 #endif
 
 /* #undef SIZEOF_INT64 */
-#ifdef SIZEOF_INT64
+#if SIZEOF_INT64
 # define HAVE_INT64 1
 #endif
 /* #undef SIZEOF_UINT64 */
-#ifdef SIZEOF_UINT64
+#if SIZEOF_UINT64
 # define HAVE_UINT64 1
 #endif
 
 /* #undef SIZEOF_SOCKLEN_T */
-#ifdef SIZEOF_SOCKLEN_T
+#if SIZEOF_SOCKLEN_T
 # define HAVE_SOCKLEN_T 1
 #endif
 
@@ -295,3 +274,5 @@
 /* #undef HAVE_THREADS */
 #define SHAREDIR "share"
 #define DEFAULT_CHARSET_HOME "/usr/local"
+#define PLUGINDIR "/usr/local/lib/plugin"
+

external/libmariadb/configs/mysql_version.h

@@ -7,15 +7,19 @@
 #include <custom_conf.h>
 #else
 #define PROTOCOL_VERSION 10
-#define MYSQL_CLIENT_VERSION "5.3.2"
-#define MYSQL_SERVER_VERSION "5.3.2"
+#define MYSQL_CLIENT_VERSION "5.5.0"
+#define MYSQL_SERVER_VERSION "5.5.0"
 #define MYSQL_SERVER_SUFFIX ""
 #define FRM_VER
-#define MYSQL_VERSION_ID 50302
+#define MYSQL_VERSION_ID 50500
 #define MYSQL_PORT 3306
 #define MYSQL_UNIX_ADDR "/tmp/mysql.sock"
 #define MYSQL_CONFIG_NAME "my"
 
+#define MARIADB_PACKAGE_VERSION "1.1.2"
+#define MARIADB_SYSTEM_TYPE "Linux"
+#define MARIADB_MACHINE_TYPE "x86_64"
+
 /* mysqld compile time options */
 #ifndef MYSQL_CHARSET
 #define MYSQL_CHARSET ""

external/libmariadb/mariadb-msvc.patch.1

---- mariadb/libmysql/my_pthread.c.orig	2013-04-17 15:45:52.025896770 +0200
-+++ mariadb/libmysql/my_pthread.c	2013-04-17 15:47:32.292895908 +0200
+--- mariadb/libmariadb/my_pthread.c.orig	2013-04-17 15:45:52.025896770 +0200
++++ mariadb/libmariadb/my_pthread.c	2013-04-17 15:47:32.292895908 +0200
 @@ -28,6 +28,10 @@
  
  #ifdef _WIN32

external/libmariadb/mariadb-static-inline.patch

---- mariadb/libmysql/net.c	2013-03-15 21:05:15.551769966 +0100
-+++ mariadb/libmysql/net.c	2013-03-15 21:26:13.543332306 +0100
-@@ -75,7 +75,7 @@
- #define thr_alarm_in_use(A) (*(A))
- #define thr_end_alarm(A)
- #define thr_alarm(A,B,C) local_thr_alarm((A),(B),(C))
--inline int local_thr_alarm(my_bool *A,int B __attribute__((unused)),ALARM *C __attribute__((unused)))
-+static inline int local_thr_alarm(my_bool *A,int B __attribute__((unused)),ALARM *C __attribute__((unused)))
- {
-   *A=1;
-   return 0;

external/libmariadb/mariadb-thread.patch

---- 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;