database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Another implementation of send_eof() cleanup

Browse Source
This commit is contained in:
konstantin@mysql.com
2004-02-10 18:33:06 +03:00
parent dc696d2e5d
commit 94c71f4bf8
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/protocol.cc
View File

@@ -313,6 +313,7 @@ send_ok(THD *thd, ha_rows affected_rows, ulonglong id, const char *message)
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
static char eof_buff[1]= { (char) 254 }; /* Marker for end of fields */
/* /*
Send eof (= end of result set) to the client Send eof (= end of result set) to the client
@@ -339,12 +340,11 @@ send_ok(THD *thd, ha_rows affected_rows, ulonglong id, const char *message)
void void
send_eof(THD *thd, bool no_flush) send_eof(THD *thd, bool no_flush)
{ {
static char eof_buff[1]= { (char) 254 }; /* Marker for end of fields */
NET *net= &thd->net; NET *net= &thd->net;
DBUG_ENTER("send_eof"); DBUG_ENTER("send_eof");
if (net->vio != 0) if (net->vio != 0)
{ {
if (!no_flush && (thd->client_capabilities & CLIENT_PROTOCOL_41)) if (thd->client_capabilities & CLIENT_PROTOCOL_41)
{ {
uchar buff[5]; uchar buff[5];
uint tmp= min(thd->total_warn_count, 65535); uint tmp= min(thd->total_warn_count, 65535);
@@ -384,9 +384,8 @@ send_eof(THD *thd, bool no_flush)
bool send_old_password_request(THD *thd) bool send_old_password_request(THD *thd)
{ {
static char buff[1]= { (char) 254 };
NET *net= &thd->net; NET *net= &thd->net;
return my_net_write(net, buff, 1) || net_flush(net); return my_net_write(net, eof_buff, 1) || net_flush(net);
} }
#endif /* EMBEDDED_LIBRARY */ #endif /* EMBEDDED_LIBRARY */
@@ -585,7 +584,7 @@ bool Protocol::send_fields(List<Item> *list, uint flag)
#endif #endif
} }
send_eof(thd, 1); my_net_write(&thd->net, eof_buff, 1);
DBUG_RETURN(prepare_for_send(list)); DBUG_RETURN(prepare_for_send(list));
err: err: