Merge branch '2.2' into develop

2018-04-13 14:53:00 +03:00
parent 3c8d3feff9 3d8d2beaaa
commit ec33fcf87d
19 changed files with 457 additions and 80 deletions
--- a/server/modules/protocol/MySQL/mariadbclient/setsqlmodeparser.hh
+++ b/server/modules/protocol/MySQL/mariadbclient/setsqlmodeparser.hh
@ -562,7 +562,7 @@ private:

            if (m_pI != m_pEnd)
            {
-                MXS_WARNING("Non-space data found after semi-colon: '%.*s'.",
+                MXS_INFO("Non-space data found after semi-colon: '%.*s'.",
                            (int)(m_pEnd - m_pI), m_pI);
            }