[Libreoffice-commits] core.git: connectivity/source

[Caolán McNamara (via logerrit)]

 connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d8f11761d89b3279e547f789d43d47c85a3ddba1
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Oct 19 17:48:59 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Oct 19 21:06:25 2019 +0200

    mariadb still uses char for my_bool
    
    mariadb-devel-10.3.17-1.fc30.x86_64
    
    still has
    
    typedef char my_bool;
    
    Change-Id: I3d1f5423c8750180bc28c56bc0ead4f746fd1c23
    Reviewed-on: https://gerrit.libreoffice.org/81137
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx
index 3450473ee895..660fd17de2b2 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx
@@ -39,7 +39,7 @@ using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::RuntimeException;
 using ::com::sun::star::uno::Type;
 
-#if defined MYSQL_VERSION_ID && (MYSQL_VERSION_ID >= 80000)
+#if defined MYSQL_VERSION_ID && (MYSQL_VERSION_ID >= 80000) && !defined MARIADB_BASE_VERSION
 using my_bool = bool;
 #else
 using my_bool = char;