summaryrefslogtreecommitdiff
path: root/sql/net_pkg.cc
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2002-09-03 09:50:36 +0300
committerunknown <bell@sanja.is.com.ua>2002-09-03 09:50:36 +0300
commit3fbcafea9c5e85dc6315f0b89872ac5e273195c8 (patch)
tree80af274b045962ab1f5805301ffc1dfa15a21b96 /sql/net_pkg.cc
parent1648e47889f6c981847ab300bf6e71d08c9f0667 (diff)
downloadmariadb-git-3fbcafea9c5e85dc6315f0b89872ac5e273195c8.tar.gz
subselect with union
new error handling Item_ref bug fixed include/mysql_com.h: new error handling query cache pointer description mysql-test/r/distinct.result: new result's after Monty's bug fixing mysql-test/r/subselect.result: subselect with union test mysql-test/t/subselect.test: subselect with union test sql/item.cc: subselect with union Item_ref bug fixed sql/item_cmpfunc.cc: Monty's bug fixing sql/item_subselect.cc: TODO changing subselect with union sql/item_subselect.h: subselect with union sql/mysql_priv.h: Item_ref bug fixed sql/mysqld.cc: new error handling sql/net_pkg.cc: new error handling sql/net_serv.cc: new error handling sql/sql_base.cc: Item_ref bug fixed sql/sql_class.cc: new error handling sql/sql_class.h: new error handling sql/sql_derived.cc: subselect with union sql/sql_insert.cc: new error handling (only with mysql_select now) sql/sql_lex.cc: subselect with union sql/sql_lex.h: subselect with union sql/sql_parse.cc: new error handling sql/sql_select.cc: new error handling subselect with union removed thd->where=0 hack sql/sql_select.h: subselect with union sql/sql_union.cc: subselect with union sql/sql_update.cc: new error handling (only with mysql_select now) sql/sql_yacc.yy: subselect with union
Diffstat (limited to 'sql/net_pkg.cc')
-rw-r--r--sql/net_pkg.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/net_pkg.cc b/sql/net_pkg.cc
index fa3abc68bfa..5551e2b19bc 100644
--- a/sql/net_pkg.cc
+++ b/sql/net_pkg.cc
@@ -72,7 +72,10 @@ void send_error(NET *net, uint sql_errno, const char *err)
}
VOID(net_write_command(net,(uchar) 255,(char*) err,length));
if (thd)
- thd->fatal_error=0; // Error message is given
+ {
+ thd->fatal_error= 0; // Error message is given
+ thd->net.report_error= 0;
+ }
DBUG_VOID_RETURN;
}