← Back to branch summary

~singhabhishek-bit/drizzle/drizzle-bug-644807

« back to all changes in this revision

Viewing changes to client/drizzletest.cc

  • Committer: Lee Bieber
  • Date: 2011-03-29 22:31:41 UTC
  • mfrom: (2257.1.3 build)
  • Revision ID: kalebral@gmail.com-20110329223141-yxc22h3l2he58sk0
Merge Andrew - 743842: Build failure using GCC 4.6
Merge Stewart - 738022: CachedDirectory silently fails to add entries if stat() fails
Merge Olaf - Common fwd: add copyright, add more declaration

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzletest.cc
3819
3819
{
3820
3820
  uint32_t con_port= opt_port;
3821
3821
  const char *con_options;
3822
 
  bool con_ssl= 0;
3823
3822
  struct st_connection* con_slot;
3824
3823
 
3825
3824
  string ds_connection_name;
3883
3882
    end= con_options;
3884
3883
    while (*end && !my_isspace(charset_info, *end))
3885
3884
      end++;
3886
 
    if (!strncmp(con_options, "SSL", 3))
3887
 
      con_ssl= 1;
3888
 
    else
3889
 
      die("Illegal option to connect: %.*s",
3890
 
          (int) (end - con_options), con_options);
 
3885
    die("Illegal option to connect: %.*s",
 
3886
        (int) (end - con_options), con_options);
3891
3887
    /* Process next option */
3892
3888
    con_options= end;
3893
3889
  }