← 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: 2010-11-13 03:36:33 UTC
  • mto: This revision was merged to the branch mainline in revision 1929.
  • Revision ID: brian@tangent.org-20101113033633-3v9ep5ow832wmf4s
Merge up the tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/mysql_protocol/net_serv.cc
37
37
#include "vio.h"
38
38
#include "net_serv.h"
39
39
 
40
 
namespace drizzle_plugin
41
 
{
42
 
 
43
40
using namespace std;
44
41
using namespace drizzled;
45
42
 
579
576
      break;
580
577
    }
581
578
    pos+=length;
582
 
 
583
 
    /* If this is an error we may not have a current_session any more */
584
 
    if (current_session)
585
 
      current_session->status_var.bytes_sent+= length;
 
579
    current_session->status_var.bytes_sent+= length;
586
580
  }
587
581
end:
588
582
  if ((net->compress) && (packet != NULL))
904
898
  net->last_error[0]= '\0';
905
899
  strcpy(net->sqlstate, not_error_sqlstate);
906
900
}
907
 
 
908
 
} /* namespace drizzle_plugin */