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 | fdbef84347f775c7a2ce44ef41a744df5201f4e0 (patch) | |
| tree | 2b69f5dc4ed6a2fca5bff6279464516aad56386b /sql | |
| parent | 43316c794ad497f63d92f21f818e9599d642f772 (diff) | |
| parent | 5932330839daa3c211b7db81d0ce1b50b8b928f8 (diff) | |
| download | mariadb-git-fdbef84347f775c7a2ce44ef41a744df5201f4e0.tar.gz | |
merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/net_serv.cc | 8 | ||||
| -rw-r--r-- | sql/sql_load.cc | 4 |
2 files changed, 11 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], diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 2c42f29ae71..7e540ffbe4b 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -995,6 +995,10 @@ read_sep_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list, DBUG_RETURN(1); } } + + if (thd->is_error()) + read_info.error= 1; + if (read_info.error) break; if (skip_lines) |