hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-1595 Rename mysqlclient to mariadbclient

Browse Source 
Documentation update will follow.
This commit is contained in:
Johan Wikman
2018-01-04 19:43:06 +02:00
parent c39dab9434
commit f129dd56be
10 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/protocol/MySQL/CMakeLists.txt
View File

@ -3,6 +3,6 @@ target_link_libraries(mysqlcommon maxscale-common)
set_target_properties(mysqlcommon PROPERTIES VERSION "2.0.0")
install_module(mysqlcommon core)
add_subdirectory(MySQLBackend)
add_subdirectory(MySQLClient)
add_subdirectory(mariadbbackend)
add_subdirectory(mariadbclient)
add_subdirectory(test)

8
server/modules/protocol/MySQL/MySQLClient/CMakeLists.txt
View File

@ -1,8 +0,0 @@
add_library(mysqlclient SHARED mysql_client.cc)
target_link_libraries(mysqlclient maxscale-common mysqlcommon)
set_target_properties(mysqlclient PROPERTIES VERSION "1.0.0")
install_module(mysqlclient core)
if(BUILD_TESTS)
add_subdirectory(test)
endif()

8
server/modules/protocol/MySQL/mariadbclient/CMakeLists.txt Normal file
View File

@ -0,0 +1,8 @@
add_library(mariadbclient SHARED mysql_client.cc)
target_link_libraries(mariadbclient maxscale-common mysqlcommon)
set_target_properties(mariadbclient PROPERTIES VERSION "1.0.0")
install_module(mariadbclient core)
if(BUILD_TESTS)
add_subdirectory(test)
endif()

2
server/modules/protocol/MySQL/MySQLClient/mysql_client.cc → server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
View File

@ -12,7 +12,7 @@
* Public License.
*/
#define MXS_MODULE_NAME "MySQLClient"
#define MXS_MODULE_NAME "mariadbclient"
#include <maxscale/cppdefs.hh>

0
server/modules/protocol/MySQL/MySQLClient/setsqlmodeparser.hh → server/modules/protocol/MySQL/mariadbclient/setsqlmodeparser.hh
View File

0
server/modules/protocol/MySQL/MySQLClient/test/CMakeLists.txt → server/modules/protocol/MySQL/mariadbclient/test/CMakeLists.txt
View File

0
server/modules/protocol/MySQL/MySQLClient/test/test_setsqlmodeparser.cc → server/modules/protocol/MySQL/mariadbclient/test/test_setsqlmodeparser.cc
View File

2
server/modules/protocol/MySQL/test/test_parse_kill.cc
View File

@ -1,6 +1,6 @@
#include <maxscale/cdefs.h>
#include "../MySQLClient/mysql_client.cc"
#include "../mariadbclient/mysql_client.cc"
#define NO_THREAD_ID 0