more s/MYSQLC/MARIADBC/ to make mysqlc actually build...

Change-Id: I286c2100c33371d5ed1ac0be3ae6393dabe6c4ef

mysqlc/Library_mysqlc.mk

@@ -39,9 +39,9 @@ $(eval $(call gb_Library_use_libraries,mysqlc,\
 $(eval $(call gb_Library_add_defs,mysqlc,\
 	-DCPPDBC_EXPORTS \
 	-DCPPCON_LIB_BUILD \
-	-DMYSQLC_VERSION_MAJOR=$(MYSQLC_MAJOR) \
-	-DMYSQLC_VERSION_MINOR=$(MYSQLC_MINOR) \
-	-DMYSQLC_VERSION_MICRO=$(MYSQLC_MICRO) \
+	-DMARIADBC_VERSION_MAJOR=$(MARIADBC_MAJOR) \
+	-DMARIADBC_VERSION_MINOR=$(MARIADBC_MINOR) \
+	-DMARIADBC_VERSION_MICRO=$(MARIADBC_MICRO) \
 	$(if $(filter NO,$(SYSTEM_MYSQL_CPPCONN)),\
 	-DCPPCONN_LIB=\"$(call gb_Library_get_runtime_filename,mysqlcppconn)\") \
 ))

mysqlc/Module_mysqlc.mk.rej

@@ -0,0 +1,11 @@
+--- mysqlc/Module_mysqlc.mk
++++ mysqlc/Module_mysqlc.mk
+@@ -9,7 +9,7 @@
+ 
+ $(eval $(call gb_Module_Module,mysqlc))
+ 
+-ifeq ($(ENABLE_MYSQLC),YES)
++ifeq ($(ENABLE_MARIADBC),YES)
+ 
+ $(eval $(call gb_Module_add_targets,mysqlc,\
+ 	Configuration_mysql \

mysqlc/source/mysqlc_databasemetadata.cxx

@@ -1176,7 +1176,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion()
     throw(RuntimeException)
 {
     OSL_TRACE("ODatabaseMetaData::getDriverMajorVersion");
-    return MYSQLC_VERSION_MAJOR;
+    return MARIADBC_VERSION_MAJOR;
 }
 /* }}} */
 
@@ -1210,7 +1210,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion()
     throw(RuntimeException)
 {
     OSL_TRACE("ODatabaseMetaData::getDriverMinorVersion");
-    return MYSQLC_VERSION_MINOR;
+    return MARIADBC_VERSION_MINOR;
 }
 /* }}} */
 

mysqlc/source/mysqlc_driver.cxx

@@ -277,7 +277,7 @@ sal_Int32 SAL_CALL MysqlCDriver::getMajorVersion()
     throw(RuntimeException)
 {
     OSL_TRACE("MysqlCDriver::getMajorVersion");
-    return MYSQLC_VERSION_MAJOR;
+    return MARIADBC_VERSION_MAJOR;
 }
 /* }}} */
 
@@ -287,7 +287,7 @@ sal_Int32 SAL_CALL MysqlCDriver::getMinorVersion()
     throw(RuntimeException)
 {
     OSL_TRACE("MysqlCDriver::getMinorVersion");
-    return MYSQLC_VERSION_MINOR;
+    return MARIADBC_VERSION_MINOR;
 }
 /* }}} */