Merge branch '2.3' into 2.4

query_classifier/test/expected.sql

@@ -33,3 +33,4 @@ QUERY_TYPE_READ
 QUERY_TYPE_SESSION_WRITE|QUERY_TYPE_USERVAR_WRITE
 QUERY_TYPE_READ|QUERY_TYPE_MASTER_READ
 QUERY_TYPE_WRITE
+QUERY_TYPE_READ

query_classifier/test/input.sql

@@ -33,3 +33,4 @@ select timediff(cast('2004-12-30 12:00:00' as time), '12:00:00');
 SET @saved_cs_client= @@character_set_client;
 SELECT 1 AS c1 FROM t1 ORDER BY ( SELECT 1 AS c2 FROM t1 GROUP BY GREATEST(LAST_INSERT_ID(), t1.a) ORDER BY GREATEST(LAST_INSERT_ID(), t1.a) LIMIT 1);
 SET PASSWORD FOR 'user'@'10.0.0.1'='*C50EB75D7CB4C76B5264218B92BC69E6815B057A';
+SELECT UTC_TIMESTAMP();