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/mysql_common.cc
+++ b/server/modules/protocol/MySQL/mysql_common.cc
@ -1668,8 +1668,7 @@ bool mxs_mysql_command_will_respond(uint8_t cmd)
 {
    return cmd != MXS_COM_STMT_SEND_LONG_DATA &&
           cmd != MXS_COM_QUIT &&
-           cmd != MXS_COM_STMT_CLOSE &&
-           cmd != MXS_COM_STMT_FETCH;
+           cmd != MXS_COM_STMT_CLOSE;
 }

 typedef std::vector< std::pair<SERVER*, uint64_t> > TargetList;