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 /libmysql | |
| 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 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 423068a6ba2..99bd393a907 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -4751,7 +4751,7 @@ int STDCALL mysql_stmt_store_result(MYSQL_STMT *stmt) if (!mysql) { /* mysql can be reset in mysql_close called from mysql_reconnect */ - set_stmt_error(stmt, CR_SERVER_LOST, unknown_sqlstate); + set_stmt_error(stmt, CR_SERVER_LOST, unknown_sqlstate, NULL); DBUG_RETURN(1); } |