summaryrefslogtreecommitdiff
path: root/sql/net_serv.cc
diff options
context:
space:
mode:
authorpetr@mysql.com <>2004-11-04 02:57:31 +0300
committerpetr@mysql.com <>2004-11-04 02:57:31 +0300
commit7896c6c39790972cebf82f1aefe12e8a7f165ae8 (patch)
treebae058b5ba3fbcdf419cf63b3c15c4aed5e43d4a /sql/net_serv.cc
parent13570dcf9fdf76be097e3b4bece9500544006e5b (diff)
parentb2dd380beb303592d3504824cfdd69fa724aee0e (diff)
downloadmariadb-git-7896c6c39790972cebf82f1aefe12e8a7f165ae8.tar.gz
Merge mysql.com:/home/cps/mysql/trees/mysql-5.0
into mysql.com:/home/cps/mysql/devel/im/prereview/mysql-5.0
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 78d254fccb1..0a728440e4d 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;