summaryrefslogtreecommitdiff
path: root/sql/protocol.h
diff options
context:
space:
mode:
authorunknown <konstantin@mysql.com>2005-06-30 16:17:10 +0400
committerunknown <konstantin@mysql.com>2005-06-30 16:17:10 +0400
commitec9ac3fe5c823b6ae7ccb0902c267b811bf732e7 (patch)
treeb91ecb9596611574c3dc8bcfd25af12fca92bfe9 /sql/protocol.h
parent7a5ec7606d9cf70697484df7c235341bc574b4a0 (diff)
downloadmariadb-git-ec9ac3fe5c823b6ae7ccb0902c267b811bf732e7.tar.gz
A fix and a test case for Bug#10794 "mysql_stmt_attr_set no
open cursor after mysql_stmt_execute" + post-review fixes. The bug was caused by wrong flags in stmt->server_status on the client side: if there was no cursor, the server didn't send server_status flags to the client, and the old flags were used to set up the fetch function of a statement. Consequently, stmt_read_row_from_cursor was used when there was no cursor. The fix fixes the server to always send server flags to the client. include/mysql_com.h: Update stale comments. libmysql/libmysql.c: Remove an extra assignment. libmysqld/lib_sql.cc: Update to correspond to the changed signature of send_eof sql/protocol.cc: Actual fix for bug#10794: create a function that writes the eof packet to network and use it from send_fields. We need to send a full eof packet from send_fields to inform the client about the cursor status (that there is no cursor in this case). sql/protocol.h: Remove an unused parameter for send_eof. tests/mysql_client_test.c: A test case for Bug#10794 "mysql_stmt_attr_set no open cursor after mysql_stmt_execute"
Diffstat (limited to 'sql/protocol.h')
-rw-r--r--sql/protocol.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/protocol.h b/sql/protocol.h
index 5b402cb2669..2717d2258fa 100644
--- a/sql/protocol.h
+++ b/sql/protocol.h
@@ -179,7 +179,7 @@ void net_printf_error(THD *thd, uint sql_errno, ...);
void net_send_error(THD *thd, uint sql_errno=0, const char *err=0);
void send_ok(THD *thd, ha_rows affected_rows=0L, ulonglong id=0L,
const char *info=0);
-void send_eof(THD *thd, bool no_flush=0);
+void send_eof(THD *thd);
bool send_old_password_request(THD *thd);
char *net_store_length(char *packet,uint length);
char *net_store_data(char *to,const char *from, uint length);