← 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-03-18 07:21:37 UTC
  • mfrom: (1302.4.15 prototest)
  • Revision ID: brian@gaz-20100318072137-qgrmlba0mn321mso
Merge Eric.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/mysql_protocol/net_serv.cc
20
20
 
21
21
#include "config.h"
22
22
#include <drizzled/session.h>
 
23
#include <drizzled/error.h>
23
24
 
24
25
#include <assert.h>
25
26
#include <stdio.h>
37
38
#include "net_serv.h"
38
39
 
39
40
using namespace std;
 
41
using namespace drizzled;
40
42
 
41
43
/*
42
44
  The following handles the differences when this is linked between the
159
161
  {
160
162
    /* @todo: 1 and 2 codes are identical. */
161
163
    net->error= 1;
162
 
    net->last_errno= CR_NET_PACKET_TOO_LARGE;
 
164
    net->last_errno= ER_NET_PACKET_TOO_LARGE;
 
165
    my_error(ER_NET_PACKET_TOO_LARGE, MYF(0));
163
166
    return(1);
164
167
  }
165
168
  pkt_length = (length+IO_SIZE-1) & ~(IO_SIZE-1);
552
555
          if (drizzleclient_vio_should_retry(net->vio) && retry_count++ < net->retry_count)
553
556
            continue;
554
557
          net->error= 2;                     /* Close socket */
555
 
          net->last_errno= CR_NET_PACKET_TOO_LARGE;
 
558
          net->last_errno= ER_NET_PACKET_TOO_LARGE;
 
559
          my_error(ER_NET_PACKET_TOO_LARGE, MYF(0));
556
560
          goto end;
557
561
        }
558
562
        retry_count=0;
650
654
      {
651
655
        len= packet_error;
652
656
        /* Not a NET error on the client. XXX: why? */
 
657
        my_error(ER_NET_PACKETS_OUT_OF_ORDER, MYF(0));
653
658
        goto end;
654
659
      }
655
660
      net->compress_pkt_nr= ++net->pkt_nr;