MXS-1595 Rename mysqlclient to mariadbclient

Documentation update will follow.

query_classifier/test/compare.cc

@@ -25,7 +25,7 @@
 #include <maxscale/log_manager.h>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/query_classifier.h>
-#include "../../server/modules/protocol/MySQL/MySQLClient/setsqlmodeparser.hh"
+#include "../../server/modules/protocol/MySQL/mariadbclient/setsqlmodeparser.hh"
 #include "testreader.hh"
 using std::cerr;
 using std::cin;

server/core/load_utils.cc

@@ -62,7 +62,8 @@ struct NAME_MAPPING
 
 static NAME_MAPPING name_mappings[] =
 {
-    { MODULE_MONITOR, "mysqlmon", "mariadbmon", false }
+    { MODULE_MONITOR,  "mysqlmon",    "mariadbmon",    false },
+    { MODULE_PROTOCOL, "mysqlclient", "mariadbclient", false }
 };
 
 static const size_t N_NAME_MAPPINGS = sizeof(name_mappings) / sizeof(name_mappings[0]);

server/modules/protocol/MySQL/CMakeLists.txt

@@ -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)

server/modules/protocol/MySQL/MySQLClient/CMakeLists.txt

@@ -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()

server/modules/protocol/MySQL/mariadbclient/CMakeLists.txt

@@ -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()

server/modules/protocol/MySQL/mariadbclient/mysql_client.cc

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

server/modules/protocol/MySQL/test/test_parse_kill.cc

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