Merge branch '2.0' into develop-2.0-merge

2016-11-15 00:09:24 +02:00
parent 2202ec7a33 7ddb4d8e5a
commit 3c15b58891
26 changed files with 621 additions and 239 deletions
--- a/server/modules/protocol/MySQL/MySQLClient/mysql_client.c
+++ b/server/modules/protocol/MySQL/MySQLClient/mysql_client.c
@ -191,6 +191,11 @@ int MySQLSendHandshake(DCB* dcb)
    int len_version_string = 0;
    int id_num;

+    if (dcb->service->dbref)
+    {
+        mysql_server_language = dcb->service->dbref->server->charset;
+    }
+
    MySQLProtocol *protocol = DCB_PROTOCOL(dcb, MySQLProtocol);
    GWBUF *buf;