← 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-14 19:39:48 UTC
  • mfrom: (383.1.43 client-split)
  • Revision ID: monty@inaugust.com-20080914193948-ns2p0lts4qtsqx7n
Merged from client-split.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzletest.cc
3794
3794
  if (opt_compress || con_compress)
3795
3795
    drizzle_options(&con_slot->drizzle, DRIZZLE_OPT_COMPRESS, NullS);
3796
3796
  drizzle_options(&con_slot->drizzle, DRIZZLE_OPT_LOCAL_INFILE, 0);
3797
 
  drizzle_options(&con_slot->drizzle, DRIZZLE_SET_CHARSET_NAME,
3798
 
                  charset_info->csname);
3799
3797
  int opt_protocol= DRIZZLE_PROTOCOL_TCP;
3800
3798
  drizzle_options(&con_slot->drizzle,DRIZZLE_OPT_PROTOCOL,(char*)&opt_protocol);
3801
 
  if (opt_charsets_dir)
3802
 
    drizzle_options(&con_slot->drizzle, DRIZZLE_SET_CHARSET_DIR,
3803
 
                    opt_charsets_dir);
3804
3799
 
3805
3800
  /* Use default db name */
3806
3801
  if (ds_database.length() == 0)
5502
5497
  if (opt_compress)
5503
5498
    drizzle_options(&cur_con->drizzle,DRIZZLE_OPT_COMPRESS,NullS);
5504
5499
  drizzle_options(&cur_con->drizzle, DRIZZLE_OPT_LOCAL_INFILE, 0);
5505
 
  drizzle_options(&cur_con->drizzle, DRIZZLE_SET_CHARSET_NAME,
5506
 
                  charset_info->csname);
5507
5500
  int opt_protocol= DRIZZLE_PROTOCOL_TCP;
5508
5501
  drizzle_options(&cur_con->drizzle,DRIZZLE_OPT_PROTOCOL,(char*)&opt_protocol);
5509
 
  if (opt_charsets_dir)
5510
 
    drizzle_options(&cur_con->drizzle, DRIZZLE_SET_CHARSET_DIR,
5511
 
                    opt_charsets_dir);
5512
5502
 
5513
5503
  if (!(cur_con->name = my_strdup("default", MYF(MY_WME))))
5514
5504
    die("Out of memory");