Skip to content
Permalink
Browse files

MDEV-12660 inconsistent mysql_stmt_close

remove dead code: this "return rc" could've never happened,
because reset_stmt_handle can only possibly fail if RESET_SERVER
flag is used.

But this "return rc" was confusing, it was under DBUG_ENTER (while
not being DBUG_RETURN) and it was skipping required stmt cleanup
at the end of the function.
  • Loading branch information...
vuvova committed May 13, 2017
1 parent a65623b commit a8773ef380609e238601dee94e026d99d4175696
Showing with 1 addition and 2 deletions.
  1. +1 −2 libmysql/libmysql.c
@@ -4713,8 +4713,7 @@ my_bool STDCALL mysql_stmt_close(MYSQL_STMT *stmt)
{
uchar buff[MYSQL_STMT_HEADER]; /* 4 bytes - stmt id */

if ((rc= reset_stmt_handle(stmt, RESET_ALL_BUFFERS | RESET_CLEAR_ERROR)))
return rc;
reset_stmt_handle(stmt, RESET_ALL_BUFFERS | RESET_CLEAR_ERROR);

int4store(buff, stmt->stmt_id);
if ((rc= stmt_command(mysql, COM_STMT_CLOSE, buff, 4, stmt)))

0 comments on commit a8773ef

Please sign in to comment.
You can’t perform that action at this time.