diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-06-09 11:29:27 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-06-09 11:29:27 +0300 |
| commit | 04f4786c081d4aa09ae91692bc494c8fd3cc3430 (patch) | |
| tree | 19f359486b756ba2484cb3d73d7ab22800675688 /sql/net_serv.cc | |
| parent | 75a18e24fa72cca07254cbabd119b944c0ef989d (diff) | |
| parent | 287fa3caf532509d01d92e8d32f2149603914137 (diff) | |
| download | mariadb-git-04f4786c081d4aa09ae91692bc494c8fd3cc3430.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 c55c4246750..38ab3a70136 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -902,7 +902,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], |