From f07cc2b3efbb276c660995042c7b6c19c441fd47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= <markus.makela@mariadb.com>
Date: Fri, 8 Sep 2017 10:47:13 +0300
Subject: [PATCH] MXS-1398: Update Connector-C to version 3.0.2

Updated the Connector-C to 3.0.2.

Removed the `mysql_com.h` header from `maxscale/protocol/mysql.h` as it is
already included by `mysql.h` and including it causes errors with
Connector-C 3.0.2.

Organized includes in `maxscale/protocol/mysql.h`.
---
 cmake/BuildMariaDBConnector.cmake |  2 +-
 include/maxscale/protocol/mysql.h | 40 ++++++++++++++++---------------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/cmake/BuildMariaDBConnector.cmake b/cmake/BuildMariaDBConnector.cmake
index 5ec1bb873..52e6eb379 100644
--- a/cmake/BuildMariaDBConnector.cmake
+++ b/cmake/BuildMariaDBConnector.cmake
@@ -9,7 +9,7 @@ set(MARIADB_CONNECTOR_C_REPO "https://github.com/MariaDB/mariadb-connector-c.git
   CACHE STRING "MariaDB Connector-C Git repository")
 
 # Release 2.3.3 (preliminary) of the Connector-C
-set(MARIADB_CONNECTOR_C_TAG "v2.3.3_pre"
+set(MARIADB_CONNECTOR_C_TAG "v3.0.2"
   CACHE STRING "MariaDB Connector-C Git tag")
 
 ExternalProject_Add(connector-c
diff --git a/include/maxscale/protocol/mysql.h b/include/maxscale/protocol/mysql.h
index 563aadef1..a1b69ba90 100644
--- a/include/maxscale/protocol/mysql.h
+++ b/include/maxscale/protocol/mysql.h
@@ -13,34 +13,36 @@
  */
 
 #include <maxscale/cdefs.h>
+
+#include <mysql.h>
+#include <mysqld_error.h>
+
+#include <arpa/inet.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <netinet/in.h>
+#include <openssl/crypto.h>
+#include <openssl/err.h>
+#include <openssl/sha.h>
+#include <openssl/ssl.h>
+#include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdint.h>
 #include <string.h>
-#include <openssl/sha.h>
 #include <sys/ioctl.h>
-#include <errno.h>
 #include <sys/socket.h>
-#include <sys/un.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <stdbool.h>
-#include <fcntl.h>
 #include <sys/types.h>
+#include <sys/un.h>
 #include <unistd.h>
-#include <openssl/crypto.h>
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-#include <maxscale/service.h>
-#include <maxscale/router.h>
-#include <maxscale/poll.h>
-#include <maxscale/users.h>
-#include <maxscale/version.h>
+
 #include <maxscale/housekeeper.h>
+#include <maxscale/poll.h>
+#include <maxscale/router.h>
+#include <maxscale/service.h>
+#include <maxscale/users.h>
 #include <maxscale/utils.h>
-#include <mysql.h>
-#include <mysql_com.h>
-#include <mysqld_error.h>
+#include <maxscale/version.h>
 
 MXS_BEGIN_DECLS