← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle/conn.c

  • Committer: Thomi Richards
  • Date: 2010-10-30 00:42:01 UTC
  • mfrom: (1891 staging)
  • mto: This revision was merged to the branch mainline in revision 1894.
  • Revision ID: thomir@gmail.com-20101030004201-zxi50ffop5xlvzve
fixed merge conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/conn.c
1007
1007
  while (con->buffer_size != 0)
1008
1008
  {
1009
1009
  
1010
 
    write_size = send(con->fd,(char *) con->buffer_ptr, con->buffer_size,0);
 
1010
    write_size = send(con->fd,(char *) con->buffer_ptr, con->buffer_size, 0);
1011
1011
 
1012
1012
    drizzle_log_crazy(con->drizzle, "write fd=%d return=%zd errno=%d", con->fd,
1013
1013
                      write_size, errno);