Merge branch '2.3' into 2.4

This commit is contained in:
Markus Mäkelä
2019-06-27 08:53:33 +03:00
9 changed files with 163 additions and 49 deletions

View File

@ -1277,8 +1277,8 @@ bool mxs_mysql_extract_ps_response(GWBUF* buffer, MXS_PS_RESPONSE* out)
{
bool rval = false;
uint8_t id[MYSQL_PS_ID_SIZE];
uint8_t cols[MYSQL_PS_ID_SIZE];
uint8_t params[MYSQL_PS_ID_SIZE];
uint8_t cols[MYSQL_PS_COLS_SIZE];
uint8_t params[MYSQL_PS_PARAMS_SIZE];
uint8_t warnings[MYSQL_PS_WARN_SIZE];
if (gwbuf_copy_data(buffer, MYSQL_PS_ID_OFFSET, sizeof(id), id) == sizeof(id)