summaryrefslogtreecommitdiff
path: root/sql/net_serv.cc
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-10-29 19:26:52 +0300
committermonty@mysql.com <>2004-10-29 19:26:52 +0300
commitafbe601302fc59c498437321b296ed6c8d360564 (patch)
tree23bcc9a71fe7237887a111b158e30f5a6bb665d3 /sql/net_serv.cc
parent67456bb970cc949ceb5779b230592e455843c35c (diff)
parent541883f9d89a8d38affba60bf9506289a6232da1 (diff)
downloadmariadb-git-afbe601302fc59c498437321b296ed6c8d360564.tar.gz
merge with 4.1
Diffstat (limited to 'sql/net_serv.cc')
-rw-r--r--sql/net_serv.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc
index 82a3b1bd520..27311cb5613 100644
--- a/sql/net_serv.cc
+++ b/sql/net_serv.cc
@@ -193,9 +193,7 @@ my_bool net_realloc(NET *net, ulong length)
{
net->error= 1;
net->report_error= 1;
-#ifdef MYSQL_SERVER
net->last_errno= ER_OUT_OF_RESOURCES;
-#endif
DBUG_RETURN(1);
}
net->buff=net->write_pos=buff;