[Libreoffice-commits] core.git: configure.ac mysqlc/README

[Lionel Elie Mamane]

 configure.ac  |    6 ++++--
 mysqlc/README |   10 +++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 2e01b87378e78945791b09318135b36b16edf0aa
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Tue Sep 9 17:03:56 2014 +0200

    fdo#83656 mariadb C client library incompatible with newer MySQL Connector/C++
    
    Change-Id: I0d9cc98070c0b9379b1fd828ac65c2d32f83a93f

diff --git a/configure.ac b/configure.ac
index b7d2fe0..d2a9e82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8224,11 +8224,12 @@ 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 development 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 client library development package.])
             fi
         fi
         AC_MSG_CHECKING([MariaDB version])
@@ -8285,6 +8286,7 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
         fi
     else
         AC_MSG_RESULT([internal])
+        AC_MSG_ERROR([libmariadb is known to be incompatible as of 2014-09; use libmysqlclient])
         SYSTEM_MARIADB=
         MARIADB_CFLAGS="-I${WORKDIR}/UnpackedTarball/mariadb/include"
         MARIADB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lmariadblib"
diff --git a/mysqlc/README b/mysqlc/README
index 8d0968f..baf0747 100644
--- a/mysqlc/README
+++ b/mysqlc/README
@@ -34,7 +34,7 @@ package/port for GNU/Linux, BSD, etc, where the packaging system
 handles dependencies and will ensure the availability of the MySQL
 client C library in the standard location.
 
-If configured with--with-system-mariadb --enable-bundle-mariadb, the
+If configured with --with-system-mariadb --enable-bundle-mariadb, the
 driver will ship a copy of the MariaDB (or MySQL) client C library so
 that it works "out of the box" on any system. That (or
 --without-system-mariadb) is usually the right choice to create a
@@ -55,9 +55,13 @@ libraries themselves.
 
 Else you can install the MariaDB Client Library from official MariaDB
 packages at https://downloads.mariadb.org/client-native/ .
-At least series 2.0 is recommended, as series 1.0 are known to be too
-buggy.
 They have source and binary distributions for several platforms.
+At least series 2.0 is recommended, as series 1.0 are known to be too
+buggy. Additionally, version 2.0.0 is known to be incompatible with
+MySQL Connector/C++ version 1.1.4, which --without-system-mysqlcppconn
+uses, and which --with-system-mysqlcppconn could use
+(see https://mariadb.atlassian.net/browse/CONC-104).
+Use a version where the above incompatibility has been solved.
 
 Alternativaly, MySQL Client Library from official MySQL
 packages are at http://dev.mysql.com/downloads/connector/c/ .