Merge branch '2.1' into 2.2

2017-10-03 14:30:06 +03:00
parent 27ccf0877c 9280f1a5d7
commit bd39284f9c
39 changed files with 685 additions and 417 deletions
--- a/server/core/monitor.cc
+++ b/server/core/monitor.cc
@ -812,7 +812,7 @@ bool check_monitor_permissions(MXS_MONITOR* monitor, const char* query)
                break;
            }
        }
-        else if (mysql_query(mondb->con, query) != 0)
+        else if (mxs_mysql_query(mondb->con, query) != 0)
        {
            switch (mysql_errno(mondb->con))
            {