Merge branch 'release-1.2' into develop

Conflicts:
	server/core/adminusers.c
	server/modules/protocol/mysql_client.c
This commit is contained in:
Markus Makela
2015-07-11 17:12:48 +03:00
39 changed files with 250 additions and 119 deletions

View File

@ -3913,7 +3913,7 @@ static GWBUF* sescmd_cursor_clone_querybuf(
}
ss_dassert(scur->scmd_cur_cmd != NULL);
buf = gwbuf_clone(scur->scmd_cur_cmd->my_sescmd_buf);
buf = gwbuf_clone_all(scur->scmd_cur_cmd->my_sescmd_buf);
CHK_GWBUF(buf);
return buf;