diff options
| author | unknown <davi@buzz.(none)> | 2008-03-17 16:39:09 -0300 |
|---|---|---|
| committer | unknown <davi@buzz.(none)> | 2008-03-17 16:39:09 -0300 |
| commit | 809522598a9a8946a5e1fa4a981717c38466a379 (patch) | |
| tree | f6c164b0b465fd5e3b8268fd3a79e89bd43d03e0 /sql/sql_prepare.cc | |
| parent | ce34828e075347de7d783d3b61ce579856ca72ad (diff) | |
| download | mariadb-git-809522598a9a8946a5e1fa4a981717c38466a379.tar.gz | |
Post-merge fixes for Bug 35103
libmysql/libmysql.c:
Manual merge
sql/sql_class.cc:
Don't send anything back to the client if disabled.
sql/sql_prepare.cc:
Don't send any packet back for statement close.
tests/mysql_client_test.c:
Manual merge
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index a027ffe9daa..c922b21af90 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -2555,6 +2555,8 @@ void mysql_stmt_close(THD *thd, char *packet) Prepared_statement *stmt; DBUG_ENTER("mysql_stmt_close"); + thd->main_da.disable_status(); + if (!(stmt= find_prepared_statement(thd, stmt_id, "mysql_stmt_close"))) DBUG_VOID_RETURN; @@ -2566,8 +2568,6 @@ void mysql_stmt_close(THD *thd, char *packet) (void) stmt->deallocate(); general_log_print(thd, thd->command, NullS); - thd->main_da.disable_status(); - DBUG_VOID_RETURN; } |