Merge branch '10.1' into 10.2

mysql-test/suite/handler/ps.test

@@ -7,5 +7,7 @@ flush status;
 handler handler_a read first;
 # handler...read must be prepared in --ps-protocol mode
 --replace_result $PS_PROTOCOL OK
+--disable_ps_protocol
 show status like 'Com_stmt_prepare%';
+--enable_ps_protocol
 drop table t1;