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-28 09:16:53 +02:00
parent ff73bc778e d2996e1ba6
commit 840b771283
3 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
query_classifier/qc_sqlite/builtin_functions.c
View File

@ -98,6 +98,7 @@ static const char* BUILTIN_FUNCTIONS[] =
"unix_timestamp", "unix_timestamp",
"utc_date", "utc_date",
"utc_time", "utc_time",
"utc_timestamp",
"week", "week",
"weekday", "weekday",
"weekofyear", "weekofyear",

1
query_classifier/test/expected.sql
View File

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

1
query_classifier/test/input.sql
View File

@ -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; 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); 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'; SET PASSWORD FOR 'user'@'10.0.0.1'='*C50EB75D7CB4C76B5264218B92BC69E6815B057A';
SELECT UTC_TIMESTAMP();