← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/mysql_protocol/net_serv.cc

  • Committer: Lee Bieber
  • Date: 2011-03-29 22:31:41 UTC
  • mfrom: (2257.1.3 build)
  • Revision ID: kalebral@gmail.com-20110329223141-yxc22h3l2he58sk0
Merge Andrew - 743842: Build failure using GCC 4.6
Merge Stewart - 738022: CachedDirectory silently fails to add entries if stat() fails
Merge Olaf - Common fwd: add copyright, add more declaration

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/mysql_protocol/net_serv.cc
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include "config.h"
 
21
#include <config.h>
 
22
 
 
23
#include <drizzled/current_session.h>
 
24
#include <drizzled/error.h>
22
25
#include <drizzled/session.h>
23
 
#include <drizzled/error.h>
 
26
#include <drizzled/statistics_variables.h>
 
27
#include <drizzled/system_variables.h>
24
28
 
25
29
#include <assert.h>
26
30
#include <stdio.h>
95
99
{
96
100
  Vio *vio_tmp= new Vio(sock);
97
101
  if (vio_tmp == NULL)
 
102
  {
98
103
    return true;
 
104
  }
99
105
  else
100
106
    if (drizzleclient_net_init(net, vio_tmp, buffer_length))
101
107
    {
103
109
       * NET object.
104
110
       */
105
111
      if (vio_tmp && (net->vio != vio_tmp))
 
112
      {
106
113
        delete vio_tmp;
 
114
      }
107
115
      else
108
116
      {
109
117
        (void) shutdown(sock, SHUT_RDWR);
124
132
 
125
133
void drizzleclient_net_close(NET *net)
126
134
{
127
 
  if (net->vio != NULL)
128
 
  {
129
 
    delete net->vio;
130
 
    net->vio= 0;
131
 
  }
 
135
  drizzled::safe_delete(net->vio);
132
136
}
133
137
 
134
138
bool drizzleclient_net_peer_addr(NET *net, char *buf, uint16_t *port, size_t buflen)
855
859
        }
856
860
      }
857
861
      else
 
862
      {
858
863
        complen= packet_len;
 
864
      }
859
865
 
860
866
    }
861
867
    buf_length+= complen;