Merge branch '2.1' into develop

2017-07-31 15:57:05 +03:00
parent 39629c412d 95c254a8b0
commit 3eb99139f5
27 changed files with 389 additions and 58 deletions
--- a/server/modules/filter/insertstream/insertstream.c
+++ b/server/modules/filter/insertstream/insertstream.c
@ -606,7 +606,8 @@ static bool extract_insert_target(GWBUF *buffer, char* target, int len)
 {
    bool rval = false;

-    if (qc_get_operation(buffer) == QUERY_OP_INSERT &&
+    if (MYSQL_GET_COMMAND(GWBUF_DATA(buffer)) == MYSQL_COM_QUERY &&
+        qc_get_operation(buffer) == QUERY_OP_INSERT &&
        only_implicit_values(buffer))
    {
        int n_tables = 0;