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

MXS-1896: Distinct LOAD DATA LOCAL INFILE from LOAD DATA INFILE

Browse Source 
The two operations return different types of results and need to be
treated differently in order for them to be handled correctly in 2.2.

This fixes the unexpected internal state errors that happened in all 2.2
versions due to a wrong assumption made by readwritesplit. This fix is not
necessary for newer versions as the LOAD DATA LOCAL INFILE processing is
done with a simpler, and more robust, method.
This commit is contained in:
Markus Mäkelä
2018-06-02 22:24:51 +03:00
parent c88aa11e11
commit cddcc6d7d5
10 changed files with 57 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
query_classifier/qc_sqlite/sqlite-src-3110100/src/parse.y
View File

@ -120,7 +120,7 @@ extern void maxscaleExecuteImmediate(Parse*, Token* pName, ExprSpan* pExprSpan,
extern void maxscaleExplain(Parse*, Token* pNext);
extern void maxscaleFlush(Parse*, Token* pWhat);
extern void maxscaleHandler(Parse*, mxs_handler_t, SrcList* pFullName, Token* pName);
extern void maxscaleLoadData(Parse*, SrcList* pFullName);
extern void maxscaleLoadData(Parse*, SrcList* pFullName, int local);
extern void maxscaleLock(Parse*, mxs_lock_t, SrcList*);
extern void maxscalePrepare(Parse*, Token* pName, Expr* pStmt);
extern void maxscalePrivileges(Parse*, int kind);
@ -2913,19 +2913,21 @@ handler ::= HANDLER nm(X) CLOSE. {
//////////////////////// The LOAD DATA INFILE statement ////////////////////////////////////
//
%type ld_local_opt {int}
cmd ::= load_data.
ld_priority_opt ::= .
ld_priority_opt ::= LOW_PRIORITY.
ld_priority_opt ::= CONCURRENT.
ld_local_opt ::= .
ld_local_opt ::= LOCAL.
ld_local_opt(A) ::= . {A = 0;}
ld_local_opt(A) ::= LOCAL. {A = 1;}
ld_charset_opt ::= .
ld_charset_opt ::= CHARACTER SET ids.
load_data ::= LOAD DATA ld_priority_opt ld_local_opt
load_data ::= LOAD DATA ld_priority_opt ld_local_opt(Y)
INFILE STRING ignore_or_replace_opt
INTO TABLE fullname(X)
/* ld_partition_opt */
@ -2935,7 +2937,7 @@ load_data ::= LOAD DATA ld_priority_opt ld_local_opt
/* ld_col_name_or_user_var_opt */
/* ld_set */.
{
maxscaleLoadData(pParse, X);
maxscaleLoadData(pParse, X, Y);
}
//////////////////////// The LOCK/UNLOCK statement ////////////////////////////////////