switch internal mariadb client to version 2

and reenable it: hopefully the worst bugs are fixed now

Change-Id: I8033ef87d02ba6619e5f778b5255fa803ba63c5b

configure.ac

@@ -8244,12 +8244,11 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
     if test "$with_system_mariadb" = "yes"; then
         AC_MSG_RESULT([external])
         SYSTEM_MARIADB=TRUE
-        #AC_PATH_PROG(MARIADBCONFIG, [mariadb_config])
+        AC_PATH_PROG(MARIADBCONFIG, [mariadb_config])
         if test -z "$MARIADBCONFIG"; then
             AC_PATH_PROG(MARIADBCONFIG, [mysql_config])
             if test -z "$MARIADBCONFIG"; then
-                #AC_MSG_ERROR([mariadb_config and mysql_config are missing. Install MariaDB or MySQL package.])
-                AC_MSG_ERROR([mysql_config is missing. Install MySQL client library development package.])
+                AC_MSG_ERROR([mariadb_config and mysql_config are missing. Install MariaDB or MySQL development package.])
             fi
         fi
         AC_MSG_CHECKING([MariaDB version])
@@ -8302,7 +8301,6 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
         fi
     else
         AC_MSG_RESULT([internal])
-        AC_MSG_ERROR([libmariadb is known to be broken as of 2013-10; use libmysqlclient])
         SYSTEM_MARIADB=
         MARIADB_CFLAGS="-I${WORKDIR}/UnpackedTarball/mariadb/include"
         MARIADB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lmariadblib"

download.lst

@@ -94,7 +94,7 @@ export LIBXMLSEC_TARBALL := 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.
 export LIBXML_TARBALL := 9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz
 export LIBXSLT_TARBALL := 9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
-export MARIADB_TARBALL := 05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2
+export MARIADB_TARBALL := a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
 export MDDS_TARBALL := aa5ca9d1ed1082890835afab26400a39-mdds_0.10.3.tar.bz2
 export MSPUB_MD5SUM := 1d489c4932109e72495b1df8b69e5f11
 export MSPUB_TARBALL := libmspub-0.1.1.tar.bz2

external/libmariadb/UnpackedTarball_mariadb.mk

@@ -28,7 +28,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,mariadb,1))
 # non-static inline local_thr_alarm in libmariadb/net.c":
 $(eval $(call gb_UnpackedTarball_add_patches,mariadb,\
     external/libmariadb/mariadb-swap.patch \
-    external/libmariadb/mariadb-trunk-101.patch \
     external/libmariadb/mariadb-msvc.patch.1 \
 ))