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

MXS-1196: Handle preparable statements when db is 10.3

Browse Source
This commit is contained in:
Johan Wikman
2017-05-02 14:26:35 +03:00
parent 298d5642f6
commit 518f7e81ca
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc
View File

@ -1908,11 +1908,15 @@ int32_t qc_mysql_get_preparable_stmt(GWBUF* stmt, GWBUF** preparable_stmt)
if (!pi->preparable_stmt) if (!pi->preparable_stmt)
{ {
const char* preparable_stmt;
size_t preparable_stmt_len;
#if MYSQL_VERSION_MINOR >= 3 #if MYSQL_VERSION_MINOR >= 3
ss_info_dassert(!true, "Preparable statements in MariaDB 10.3 not yet handled."); preparable_stmt = lex->prepared_stmt_code->name.str;
preparable_stmt_len = lex->prepared_stmt_code->name.length;
#else #else
const char* preparable_stmt = lex->prepared_stmt_code.str; preparable_stmt = lex->prepared_stmt_code.str;
size_t preparable_stmt_len = lex->prepared_stmt_code.length; preparable_stmt_len = lex->prepared_stmt_code.length;
#endif
size_t payload_len = preparable_stmt_len + 1; size_t payload_len = preparable_stmt_len + 1;
size_t packet_len = MYSQL_HEADER_LEN + payload_len; size_t packet_len = MYSQL_HEADER_LEN + payload_len;
@ -1952,7 +1956,6 @@ int32_t qc_mysql_get_preparable_stmt(GWBUF* stmt, GWBUF** preparable_stmt)
} }
pi->preparable_stmt = preperable_packet; pi->preparable_stmt = preperable_packet;
#endif
} }
*preparable_stmt = pi->preparable_stmt; *preparable_stmt = pi->preparable_stmt;