Commit 95a8b63f authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools 

into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools


client/mysqltest.c:
  Auto merged
parents 78e705cb 14c2d195

client/mysqltest.c

+6 −1
Original line number Diff line number Diff line
@@ -2991,7 +2991,12 @@ void do_connect(struct st_command *command) 
  con_options= ds_options.str;

  while (*con_options)

  {

    char* end= con_options;

    char* end;

    /* Step past any spaces in beginning of option*/

    while (*con_options && my_isspace(charset_info, *con_options))

     con_options++;

    /* Find end of this option */

    end= con_options;

    while (*end && !my_isspace(charset_info, *end))

      end++;

    if (!strncmp(con_options, "SSL", 3))