mysql_client_server_protocol.h moved.

Moved to include/maxscale/protocol/mysql.h
2016-10-13 19:40:00 +03:00
parent 485675d065
commit 3a18b64bdd
33 changed files with 44 additions and 44 deletions
--- a/server/modules/routing/avro/avro.c
+++ b/server/modules/routing/avro/avro.c
@ -43,7 +43,7 @@
 #include <maxscale/skygw_utils.h>
 #include <maxscale/log_manager.h>

-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <ini.h>
 #include <sys/stat.h>

--- a/server/modules/routing/avro/avrorouter.h
+++ b/server/modules/routing/avro/avrorouter.h
@ -33,7 +33,7 @@
 #include <maxavro.h>
 #include <binlog_common.h>
 #include <sqlite3.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>

 /** SQLite3 version 3.7.14 introduced the new v2 close interface */
 #if SQLITE_VERSION_NUMBER < 3007014
--- a/server/modules/routing/binlog/blr.c
+++ b/server/modules/routing/binlog/blr.c
@ -75,7 +75,7 @@
 #include <maxscale/skygw_utils.h>
 #include <maxscale/log_manager.h>

-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <ini.h>
 #include <sys/stat.h>
 #include <uuid/uuid.h>
--- a/server/modules/routing/binlog/blr.h
+++ b/server/modules/routing/binlog/blr.h
@ -44,7 +44,7 @@
 #include <maxscale/memlog.h>
 #include <maxscale/thread.h>
 #include <zlib.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>

 #define BINLOG_FNAMELEN         255
 #define BLR_PROTOCOL            "MySQLBackend"
--- a/server/modules/routing/binlog/blr_master.c
+++ b/server/modules/routing/binlog/blr_master.c
@ -77,7 +77,7 @@
 #include <maxscale/thread.h>

 /* Temporary requirement for auth data */
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/alloc.h>


--- a/server/modules/routing/binlog/test/testbinlog.c
+++ b/server/modules/routing/binlog/test/testbinlog.c
@ -42,7 +42,7 @@
 #include <maxscale/gwdirs.h>
 #include <maxscale/alloc.h>

-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <ini.h>
 #include <sys/stat.h>
 #include <getopt.h>
--- a/server/modules/routing/readconnroute/readconnroute.c
+++ b/server/modules/routing/readconnroute/readconnroute.c
@ -47,7 +47,7 @@
 *					and necessary headers.
 * 17/07/2013	Massimiliano Pinto	Added clientReply routine:
 *					called by backend server to send data to client
- *					Included mysql_client_server_protocol.h
+ *					Included maxscale/protocol/mysql.h
 *					with macros and MySQL commands with MYSQL_ prefix
 *					avoiding any conflict with the standard ones
 *					in mysql.h
@ -88,7 +88,7 @@
 #include <maxscale/skygw_utils.h>
 #include <maxscale/log_manager.h>

-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>

 #include <maxscale/modutil.h>

--- a/server/modules/routing/readwritesplit/rwsplit_internal.h
+++ b/server/modules/routing/readwritesplit/rwsplit_internal.h
@ -30,7 +30,7 @@ extern "C" {
 /* This needs to be removed along with dependency on it - see the 
 * rwsplit_tmp_table_multi functions
 */
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
    
 /*
 * The following are implemented in rwsplit_mysql.c
--- a/server/modules/routing/readwritesplit/rwsplit_mysql.c
+++ b/server/modules/routing/readwritesplit/rwsplit_mysql.c
@ -29,12 +29,12 @@
 #include <maxscale/spinlock.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <mysqld_error.h>
 #include <maxscale/alloc.h>

 #if defined(SS_DEBUG)
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #endif

 #define RWSPLIT_TRACE_MSG_LEN 1000
--- a/server/modules/routing/schemarouter/schemarouter.c
+++ b/server/modules/routing/schemarouter/schemarouter.c
@ -28,7 +28,7 @@
 #include <maxscale/spinlock.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/alloc.h>
 #include <maxscale/poll.h>
 #include <pcre.h>
--- a/server/modules/routing/schemarouter/schemarouter.h
+++ b/server/modules/routing/schemarouter/schemarouter.h
@ -29,7 +29,7 @@

 #include <maxscale/dcb.h>
 #include <maxscale/hashtable.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <pcre2.h>
 /**
 * Bitmask values for the router session's initialization. These values are used
--- a/server/modules/routing/schemarouter/sharding_common.h
+++ b/server/modules/routing/schemarouter/sharding_common.h
@ -18,7 +18,7 @@
 #include <poll.h>
 #include <maxscale/buffer.h>
 #include <maxscale/modutil.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/hashtable.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/query_classifier.h>