← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzletest.cc

  • Committer: Monty Taylor
  • Date: 2008-09-15 00:46:33 UTC
  • mfrom: (383.1.55 client-split)
  • Revision ID: monty@inaugust.com-20080915004633-fmjw27fi41cxs35w
Merged from client-split.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzletest.cc
47
47
#include "client_priv.h"
48
48
#include <mysys/hash.h>
49
49
#include <stdarg.h>
50
 
#include <vio/violite.h>
51
50
 
52
51
#include "errname.h"
53
52
 
3511
3510
  {
3512
3511
    if (con->drizzle.net.vio)
3513
3512
    {
3514
 
      vio_delete(con->drizzle.net.vio);
3515
 
      con->drizzle.net.vio = 0;
 
3513
      net_close(&(con->drizzle.net));
3516
3514
    }
3517
3515
  }
3518
3516
 
3794
3792
  if (opt_compress || con_compress)
3795
3793
    drizzle_options(&con_slot->drizzle, DRIZZLE_OPT_COMPRESS, NullS);
3796
3794
  drizzle_options(&con_slot->drizzle, DRIZZLE_OPT_LOCAL_INFILE, 0);
3797
 
  int opt_protocol= DRIZZLE_PROTOCOL_TCP;
3798
 
  drizzle_options(&con_slot->drizzle,DRIZZLE_OPT_PROTOCOL,(char*)&opt_protocol);
3799
3795
 
3800
3796
  /* Use default db name */
3801
3797
  if (ds_database.length() == 0)
4849
4845
    ds->append("\t", 1);
4850
4846
    replace_append_uint(ds, field->max_length);
4851
4847
    ds->append("\t", 1);
4852
 
    ds->append((char*) (IS_NOT_NULL(field->flags) ?
 
4848
    ds->append((char*) ((field->flags & NOT_NULL_FLAG) ?
4853
4849
                        "N" : "Y"), 1);
4854
4850
    ds->append("\t", 1);
4855
4851
    replace_append_uint(ds, field->flags);
5497
5493
  if (opt_compress)
5498
5494
    drizzle_options(&cur_con->drizzle,DRIZZLE_OPT_COMPRESS,NullS);
5499
5495
  drizzle_options(&cur_con->drizzle, DRIZZLE_OPT_LOCAL_INFILE, 0);
5500
 
  int opt_protocol= DRIZZLE_PROTOCOL_TCP;
5501
 
  drizzle_options(&cur_con->drizzle,DRIZZLE_OPT_PROTOCOL,(char*)&opt_protocol);
5502
5496
 
5503
5497
  if (!(cur_con->name = my_strdup("default", MYF(MY_WME))))
5504
5498
    die("Out of memory");