diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-03-06 11:45:50 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-03-06 11:46:04 +0100 |
| commit | 1bf4306c3967560948f22630ff8f76c268a9c8bd (patch) | |
| tree | 763c9f201d9f8a20b6990e8d74b01f3bc4fcaf50 /mysqlc | |
| parent | 499e53a95e79b175037ec9264d34e2ca6f7e692a (diff) | |
Switch from libmysqlc library to mariadb-native-client
Change-Id: I867918bbb61b289e1ad8752e6f46705af6e85b7c
Diffstat (limited to 'mysqlc')
| -rw-r--r-- | mysqlc/Extension_mysql-connector-ooo.mk | 4 | ||||
| -rw-r--r-- | mysqlc/Library_mysqlc.mk | 2 | ||||
| -rw-r--r-- | mysqlc/source/mysqlc_connection.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/mysqlc/Extension_mysql-connector-ooo.mk b/mysqlc/Extension_mysql-connector-ooo.mk index 7da474c47ebd..67c7c8f745d7 100644 --- a/mysqlc/Extension_mysql-connector-ooo.mk +++ b/mysqlc/Extension_mysql-connector-ooo.mk @@ -24,9 +24,9 @@ $(eval $(call gb_Extension_add_library,mysql-connector-ooo,mysqlcppconn)) endif # HACK: comes from Library_mysql.mk -ifeq ($(SYSTEM_MYSQL),NO) +ifeq ($(SYSTEM_MARIADB),NO) $(eval $(call gb_Extension_add_files,mysql-connector-ooo,,\ - $(LIBMYSQL_PATH)/lib/$(LIBMYSQL) \ + $(LIBMARIADB_PATH)/lib/$(LIBMARIADB) \ )) endif diff --git a/mysqlc/Library_mysqlc.mk b/mysqlc/Library_mysqlc.mk index cf77bc057761..ab6e5457def7 100644 --- a/mysqlc/Library_mysqlc.mk +++ b/mysqlc/Library_mysqlc.mk @@ -41,7 +41,7 @@ $(eval $(call gb_Library_add_defs,mysqlc,\ -DMYSQLC_VERSION_MAJOR=$(MYSQLC_MAJOR) \ -DMYSQLC_VERSION_MINOR=$(MYSQLC_MINOR) \ -DMYSQLC_VERSION_MICRO=$(MYSQLC_MICRO) \ - $(if $(filter NO,$(SYSTEM_MYSQL)),-DMYSQL_LIB=\"$(LIBMYSQL)\") \ + $(if $(filter NO,$(SYSTEM_MARIADB)),-DMYSQL_LIB=\"$(LIBMARIADB)\") \ $(if $(filter NO,$(SYSTEM_MYSQL_CPPCONN)),\ -DCPPCONN_LIB=\"$(call gb_Library_get_runtime_filename,mysqlcppconn)\") \ )) diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx index d0d4a467957b..717adf9e302e 100644 --- a/mysqlc/source/mysqlc_connection.cxx +++ b/mysqlc/source/mysqlc_connection.cxx @@ -99,7 +99,7 @@ void SAL_CALL OConnection::release() } /* }}} */ -#ifndef SYSTEM_MYSQL +#ifndef SYSTEM_MARIADB extern "C" { void SAL_CALL thisModule() {} } #endif @@ -194,7 +194,7 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue > connProps["socket"] = pipe_str; } -#ifndef SYSTEM_MYSQL +#ifndef SYSTEM_MARIADB ::rtl::OUString sMySQLClientLib( MYSQL_LIB ); ::rtl::OUString moduleBase; |