Merge branch '2.3' into develop

2019-05-14 12:33:50 +03:00
parent 22a9e20f1f b7d948db3f
commit c09617cd82
3 changed files with 7 additions and 5 deletions
--- a/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
+++ b/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
@ -1413,8 +1413,6 @@ int gw_MySQLAccept(DCB* dcb)
    {
        MySQLSendHandshake(dcb);
    }
-
-    return 1;
 }

 static int gw_error_client_event(DCB* dcb)