← 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: Stewart Smith
  • Author(s): Vasil Dimov
  • Date: 2010-12-06 06:43:46 UTC
  • mto: (2021.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 1986.
  • Revision ID: stewart@flamingspork.com-20101206064346-nufczti0ml6c6ilk
Merge Revision revid:vasil.dimov@oracle.com-20100927170812-jma17im0ni8ve7ku from MySQL InnoDB

Original revid:vasil.dimov@oracle.com-20100927170812-jma17im0ni8ve7ku

Original Authors: Vasil Dimov <vasil.dimov@oracle.com>
Original commit message:
Use C-style comment instead of C++ in a C header.

Spotted by:     Davi Arnaut

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>
22
 
 
23
 
#include <drizzled/current_session.h>
 
21
#include "config.h"
 
22
#include <drizzled/session.h>
24
23
#include <drizzled/error.h>
25
 
#include <drizzled/session.h>
26
24
 
27
25
#include <assert.h>
28
26
#include <stdio.h>
39
37
#include "vio.h"
40
38
#include "net_serv.h"
41
39
 
42
 
namespace drizzle_plugin
43
 
{
44
 
 
45
40
using namespace std;
46
41
using namespace drizzled;
47
42
 
581
576
      break;
582
577
    }
583
578
    pos+=length;
584
 
 
585
 
    /* If this is an error we may not have a current_session any more */
586
 
    if (current_session)
587
 
      current_session->status_var.bytes_sent+= length;
 
579
    current_session->status_var.bytes_sent+= length;
588
580
  }
589
581
end:
590
582
  if ((net->compress) && (packet != NULL))
906
898
  net->last_error[0]= '\0';
907
899
  strcpy(net->sqlstate, not_error_sqlstate);
908
900
}
909
 
 
910
 
} /* namespace drizzle_plugin */