diff options
| author | unknown <petr@mysql.com> | 2004-11-04 02:57:31 +0300 |
|---|---|---|
| committer | unknown <petr@mysql.com> | 2004-11-04 02:57:31 +0300 |
| commit | 14437e9c8f82a77b4f3f04e5b24b3c58db8e3a2b (patch) | |
| tree | bae058b5ba3fbcdf419cf63b3c15c4aed5e43d4a /sql/net_serv.cc | |
| parent | bb63229331d461baedecd0ef439914ff9458e441 (diff) | |
| parent | e981c836104675533a2eb6810f7c1606377b0491 (diff) | |
| download | mariadb-git-14437e9c8f82a77b4f3f04e5b24b3c58db8e3a2b.tar.gz | |
Merge mysql.com:/home/cps/mysql/trees/mysql-5.0
into mysql.com:/home/cps/mysql/devel/im/prereview/mysql-5.0
sql/net_serv.cc:
Auto merged
Diffstat (limited to 'sql/net_serv.cc')
| -rw-r--r-- | sql/net_serv.cc | 2 |
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; |