diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-04-29 20:18:19 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-04-29 20:18:19 -0300 |
| commit | 55b7b7563725f3f4273c3175cfa0d867afc18857 (patch) | |
| tree | f95e09dbdce7c6254c97619437e1231efe749ac6 /sql/net_serv.cc | |
| parent | 49318af314029097181fb188a19d3ce9be1ab7e4 (diff) | |
| parent | 14ccbeb4e40042e3fe624707d5b2e6c047149a2f (diff) | |
| download | mariadb-git-55b7b7563725f3f4273c3175cfa0d867afc18857.tar.gz | |
Manual merge.
Diffstat (limited to 'sql/net_serv.cc')
| -rw-r--r-- | sql/net_serv.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc index 73892f31ccf..15c0c581108 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -136,6 +136,9 @@ my_bool my_net_init(NET *net, Vio* vio) #else net->query_cache_query= 0; #endif +#if defined(MYSQL_SERVER) && !defined(EMBEDDED_LIBRARY) + net->skip_big_packet= FALSE; +#endif if (vio != 0) /* If real connection */ { @@ -949,6 +952,7 @@ my_real_read(NET *net, size_t *complen) { #if defined(MYSQL_SERVER) && !defined(NO_ALARM) if (!net->compress && + net->skip_big_packet && !my_net_skip_rest(net, (uint32) len, &alarmed, &alarm_buff)) net->error= 3; /* Successfully skiped packet */ #endif |