← 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: Brian Aker
  • Date: 2011-02-22 04:19:44 UTC
  • mto: (2192.1.1 drizzle-staging)
  • mto: This revision was merged to the branch mainline in revision 2193.
  • Revision ID: brian@tangent.org-20110222041944-furz1h252ecz7mpd
Merge in modifications such that we check both schema and table for
replication option.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/mysql_protocol/net_serv.cc
97
97
{
98
98
  Vio *vio_tmp= new Vio(sock);
99
99
  if (vio_tmp == NULL)
 
100
  {
100
101
    return true;
 
102
  }
101
103
  else
102
104
    if (drizzleclient_net_init(net, vio_tmp, buffer_length))
103
105
    {
105
107
       * NET object.
106
108
       */
107
109
      if (vio_tmp && (net->vio != vio_tmp))
 
110
      {
108
111
        delete vio_tmp;
 
112
      }
109
113
      else
110
114
      {
111
115
        (void) shutdown(sock, SHUT_RDWR);
126
130
 
127
131
void drizzleclient_net_close(NET *net)
128
132
{
129
 
  if (net->vio != NULL)
130
 
  {
131
 
    delete net->vio;
132
 
    net->vio= 0;
133
 
  }
 
133
  drizzled::safe_delete(net->vio);
134
134
}
135
135
 
136
136
bool drizzleclient_net_peer_addr(NET *net, char *buf, uint16_t *port, size_t buflen)
857
857
        }
858
858
      }
859
859
      else
 
860
      {
860
861
        complen= packet_len;
 
862
      }
861
863
 
862
864
    }
863
865
    buf_length+= complen;