← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

merge latest dev work

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
16
16
#define DRIZZLE_LEX 1
17
17
#include <drizzled/server_includes.h>
18
18
#include <libdrizzleclient/libdrizzle.h>
 
19
#include <libdrizzleclient/errmsg.h>
19
20
#include <mysys/hash.h>
20
21
#include <drizzled/logging.h>
21
22
#include <drizzled/db.h>
363
364
  {
364
365
    /* Check if we can continue without closing the connection */
365
366
 
366
 
    /* The error must be set. */
367
 
    /* This assert is killing me - and tracking down why the error isn't
368
 
     * set here is a waste since the protocol lib is being replaced. */ 
369
 
    //assert(session->is_error());
 
367
    if(net->last_errno== CR_NET_PACKET_TOO_LARGE)
 
368
      my_error(ER_NET_PACKET_TOO_LARGE, MYF(0));
 
369
    /* Assert is invalid for dirty connection shutdown
 
370
     *     assert(session->is_error());
 
371
     */
370
372
    drizzleclient_net_end_statement(session);
371
373
 
372
374
    if (net->error != 3)