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
2020-05-13 11:04:18 +03:00
parent 4cc5fa115a b212117fd3
commit f5c118d27b
4 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc
View File

@ -2337,7 +2337,8 @@ int32_t qc_mysql_get_preparable_stmt(GWBUF* stmt, GWBUF** preparable_stmt)
{ {
const char* preparable_stmt; const char* preparable_stmt;
size_t preparable_stmt_len; size_t preparable_stmt_len;
#if MYSQL_VERSION_MINOR >= 3 // MYSQL_VERSION_PATCH might be smaller, but this was detected with 10.2.32.
#if MYSQL_VERSION_MINOR >= 3 || (MYSQL_VERSION_MINOR == 2 && MYSQL_VERSION_PATCH >= 32)
preparable_stmt = qcme_get_prepared_stmt_code(lex)->str_value.ptr(); preparable_stmt = qcme_get_prepared_stmt_code(lex)->str_value.ptr();
preparable_stmt_len = qcme_get_prepared_stmt_code(lex)->str_value.length(); preparable_stmt_len = qcme_get_prepared_stmt_code(lex)->str_value.length();
#else #else

5
query_classifier/qc_sqlite/sqlite-src-3110100/src/tokenize.c
View File

@ -419,8 +419,13 @@ int sqlite3GetToken(const unsigned char *z, int *tokenType){
} }
case CC_BANG: { case CC_BANG: {
if( z[1]!='=' ){ if( z[1]!='=' ){
#ifdef MAXSCALE
*tokenType = TK_NOT;
return 1;
#else
*tokenType = TK_ILLEGAL; *tokenType = TK_ILLEGAL;
return 2; return 2;
#endif
}else{ }else{
*tokenType = TK_NE; *tokenType = TK_NE;
return 2; return 2;

1
query_classifier/test/expected.sql
View File

@ -34,3 +34,4 @@ 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 QUERY_TYPE_READ
QUERY_TYPE_WRITE

1
query_classifier/test/input.sql
View File

@ -34,3 +34,4 @@ 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(); SELECT UTC_TIMESTAMP();
SELECT COUNT(IF(!c.ispackage, 1, NULL)) as cnt FROM test FOR UPDATE;