diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-06-09 11:41:24 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-06-09 11:41:24 +0300 |
| commit | 344127f371de209bf8a0cb1a0cb9748378ea9bb6 (patch) | |
| tree | 2b69f5dc4ed6a2fca5bff6279464516aad56386b /sql/net_serv.cc | |
| parent | 60153dd36e2a79150565635d1370ed64df7cc07d (diff) | |
| parent | 04f4786c081d4aa09ae91692bc494c8fd3cc3430 (diff) | |
| download | mariadb-git-344127f371de209bf8a0cb1a0cb9748378ea9bb6.tar.gz | |
merge
Diffstat (limited to 'sql/net_serv.cc')
| -rw-r--r-- | sql/net_serv.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc index a29f0e394dc..918798529de 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -920,7 +920,13 @@ my_real_read(NET *net, size_t *complen) ("Packets out of order (Found: %d, expected %u)", (int) net->buff[net->where_b + 3], net->pkt_nr)); -#ifdef EXTRA_DEBUG + /* + We don't make noise server side, since the client is expected + to break the protocol for e.g. --send LOAD DATA .. LOCAL where + the server expects the client to send a file, but the client + may reply with a new command instead. + */ +#if defined (EXTRA_DEBUG) && !defined (MYSQL_SERVER) fflush(stdout); fprintf(stderr,"Error: Packets out of order (Found: %d, expected %d)\n", (int) net->buff[net->where_b + 3], |