Merge branch 'release-1.2' into develop

This commit is contained in:
Markus Makela
2015-07-15 11:38:27 +03:00
6 changed files with 477 additions and 262 deletions

View File

@ -4074,12 +4074,11 @@ static bool execute_sescmd_in_backend(
sescmd_cursor_set_active(scur, true);
}
buf = sescmd_cursor_clone_querybuf(scur);
switch (scur->scmd_cur_cmd->my_sescmd_packet_type) {
case MYSQL_COM_CHANGE_USER:
/** This makes it possible to handle replies correctly */
gwbuf_set_type(scur->scmd_cur_cmd->my_sescmd_buf, GWBUF_TYPE_SESCMD);
buf = sescmd_cursor_clone_querybuf(scur);
rc = dcb->func.auth(
dcb,
NULL,
@ -4112,6 +4111,7 @@ static bool execute_sescmd_in_backend(
*/
gwbuf_set_type(scur->scmd_cur_cmd->my_sescmd_buf, GWBUF_TYPE_SESCMD);
buf = sescmd_cursor_clone_querybuf(scur);
rc = dcb->func.write(
dcb,
buf);