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-09-16 09:50:05 +03:00
parent 31029eaec8 60c33b149c
commit 5e2d9f599b
7 changed files with 110 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
query_classifier/test/classify.cc
View File

@ -76,6 +76,10 @@ char* get_types_as_string(uint32_t types)
{
s = append(s, "QUERY_TYPE_SESSION_WRITE", &len);
}
if (types & QUERY_TYPE_USERVAR_WRITE)
{
s = append(s, "QUERY_TYPE_USERVAR_WRITE", &len);
}
if (types & QUERY_TYPE_USERVAR_READ)
{
s = append(s, "QUERY_TYPE_USERVAR_READ", &len);

4
query_classifier/test/expected.sql
View File

@ -28,3 +28,7 @@ QUERY_TYPE_WRITE
QUERY_TYPE_WRITE
QUERY_TYPE_WRITE
QUERY_TYPE_GSYSVAR_WRITE
QUERY_TYPE_READ
QUERY_TYPE_READ
QUERY_TYPE_USERVAR_WRITE
QUERY_TYPE_READ|QUERY_TYPE_MASTER_READ

8
query_classifier/test/input.sql
View File

@ -25,6 +25,10 @@ SELECT IS_USED_LOCK('lock1');
SELECT RELEASE_LOCK('lock1');
deallocate prepare select_stmt;
SELECT a FROM tbl FOR UPDATE;
SELECT a INTO OUTFILE 'out.txt'
SELECT a INTO DUMPFILE 'dump.txt'
SELECT a INTO OUTFILE 'out.txt';
SELECT a INTO DUMPFILE 'dump.txt';
SELECT a INTO @var;
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);