hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Johan Wikman
2019-10-07 16:17:53 +03:00
parent 4791e043f1 e7e40b0179
commit 312469dca2
7 changed files with 44 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
query_classifier/test/expected.sql
View File

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

1
query_classifier/test/input.sql
View File

@ -32,3 +32,4 @@ select timediff(cast('2004-12-30 12:00:00' as time), '12:00:00');
(select 1 as a from t1) union all (select 1 from dual) limit 1;
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';

3
query_classifier/test/maxscale.test
View File

@ -137,6 +137,9 @@ SET @saved_cs_client= @@character_set_client;
SELECT NEXTVAL(id_generator), context FROM t1 WHERE (a,b,c) >= (1,2,3);
select soundex(_utf8mb4 0xD091D092D093) as vx, gray_user_tag from user_extends where user_id > last_insert_id();
# MXS-2713
SET PASSWORD FOR 'user'@'10.0.0.1'='*C50EB75D7CB4C76B5264218B92BC69E6815B057A';
# MXS-2432
RESET QUERY CACHE;
RESET MASTER;