← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzletest.cc

  • Committer: lbieber
  • Date: 2010-10-06 16:34:16 UTC
  • mfrom: (1816.1.3 build)
  • Revision ID: lbieber@orisndriz08-20101006163416-ea0sl59qgpglk21y
Merge Monty - Change the requirement from either libinnodb to libhaildb. Also, tied it to version 2.2
Merge Andrew - fix bug 650935: remove --compress from all clients
Merge Andrew - fix bug 653471: Add -A to drizzle client
Merge Travis - 621861 = To change C structs to C++ classes in Drizzle

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzletest.cc
3846
3846
{
3847
3847
  uint32_t con_port= opt_port;
3848
3848
  const char *con_options;
3849
 
  bool con_ssl= 0, con_compress= 0;
 
3849
  bool con_ssl= 0;
3850
3850
  struct st_connection* con_slot;
3851
3851
 
3852
3852
  string ds_connection_name;
3912
3912
      end++;
3913
3913
    if (!strncmp(con_options, "SSL", 3))
3914
3914
      con_ssl= 1;
3915
 
    else if (!strncmp(con_options, "COMPRESS", 8))
3916
 
      con_compress= 1;
3917
3915
    else
3918
3916
      die("Illegal option to connect: %.*s",
3919
3917
          (int) (end - con_options), con_options);