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/core/queryclassifier.cc
+++ b/server/core/queryclassifier.cc
@ -941,7 +941,7 @@ uint32_t QueryClassifier::get_target_type(QueryClassifier::current_target_t curr
            route_target = get_route_target(*command, *type, buffer->hint);
        }
    }
-    else
+    else if (load_data_state() == QueryClassifier::LOAD_DATA_ACTIVE)
    {
        /** Empty packet signals end of LOAD DATA LOCAL INFILE, send it to master*/
        set_load_data_state(QueryClassifier::LOAD_DATA_END);