Merge branch '2.3' into develop

2019-02-07 10:50:27 +02:00
parent 934be45b68 b560a67e54
commit 42b5c39f43
12 changed files with 85 additions and 47 deletions
--- a/server/modules/protocol/MySQL/mariadbclient/setsqlmodeparser.hh
+++ b/server/modules/protocol/MySQL/mariadbclient/setsqlmodeparser.hh
@ -487,7 +487,7 @@ private:
    {
        result_t rv = IS_SET_SQL_MODE;

-        char c;
+        char c = *pSql_mode;

        do
        {