← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Monty Taylor
  • Date: 2008-09-15 00:46:33 UTC
  • mfrom: (383.1.55 client-split)
  • Revision ID: monty@inaugust.com-20080915004633-fmjw27fi41cxs35w
Merged from client-split.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
26
26
#include <sys/poll.h>
27
27
#include <netinet/tcp.h>
28
28
#include <drizzled/drizzled_error_messages.h>
29
 
#include <vio/violite.h>
30
29
 
31
30
#include <storage/myisam/ha_myisam.h>
32
31
 
871
870
  end_slave_list();
872
871
  delete binlog_filter;
873
872
  delete rpl_filter;
874
 
  vio_end();
875
873
 
876
874
  (void) my_delete(pidfile_name,MYF(0));        // This may not always exist
877
875
 
1246
1244
  {
1247
1245
    if (errcode)
1248
1246
      net_send_error(thd, errcode, ER(errcode)); /* purecov: inspected */
1249
 
    vio_close(vio);                     /* vio is freed in delete thd */
 
1247
    net_close(&(thd->net));             /* vio is freed in delete thd */
1250
1248
  }
1251
1249
  if (lock)
1252
1250
    (void) pthread_mutex_unlock(&LOCK_thread_count);
2848
2846
  uint error_count=0;
2849
2847
  THD *thd;
2850
2848
  struct sockaddr_storage cAddr;
2851
 
  st_vio *vio_tmp;
2852
2849
 
2853
2850
  MAYBE_BROKEN_SYSCALL;
2854
2851
  while (!abort_loop)
2942
2939
      VOID(close(new_sock));
2943
2940
      continue;
2944
2941
    }
2945
 
    if (!(vio_tmp=vio_new(new_sock, VIO_TYPE_TCPIP, sock == 0)) ||
2946
 
        my_net_init(&thd->net,vio_tmp))
 
2942
    if (net_init_sock(&thd->net, new_sock, sock == 0))
2947
2943
    {
2948
 
      /*
2949
 
        Only delete the temporary vio if we didn't already attach it to the
2950
 
        NET object. The destructor in THD will delete any initialized net
2951
 
        structure.
2952
 
      */
2953
 
      if (vio_tmp && thd->net.vio != vio_tmp)
2954
 
        vio_delete(vio_tmp);
2955
 
      else
2956
 
      {
2957
 
        (void) shutdown(new_sock, SHUT_RDWR);
2958
 
        (void) close(new_sock);
2959
 
      }
2960
2944
      delete thd;
2961
2945
      continue;
2962
2946
    }