Commit 8d1b76e7 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
parents d8c26c7b cb241bdc

client/mysqltest.c

+4 −4
Original line number Diff line number Diff line
@@ -2888,10 +2888,6 @@ static struct my_option my_long_options[] = 
  {"compress", 'C', "Use the compressed server/client protocol.",

   (gptr*) &opt_compress, (gptr*) &opt_compress, 0, GET_BOOL, NO_ARG, 0, 0, 0,

   0, 0, 0},

  {"max-connect-retries", OPT_MAX_CONNECT_RETRIES,

   "Max number of connection attempts when connecting to server",

   (gptr*) &opt_max_connect_retries, (gptr*) &opt_max_connect_retries, 0,

   GET_INT, REQUIRED_ARG, 5, 1, 10, 0, 0, 0},

  {"cursor-protocol", OPT_CURSOR_PROTOCOL, "Use cursors for prepared statements.",

   (gptr*) &cursor_protocol, (gptr*) &cursor_protocol, 0,

   GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -2920,6 +2916,10 @@ static struct my_option my_long_options[] = 
  {"manager-wait-timeout", OPT_MANAGER_WAIT_TIMEOUT,

   "Undocumented: Used for debugging.", (gptr*) &manager_wait_timeout,

   (gptr*) &manager_wait_timeout, 0, GET_INT, REQUIRED_ARG, 3, 0, 0, 0, 0, 0},

  {"max-connect-retries", OPT_MAX_CONNECT_RETRIES,

   "Max number of connection attempts when connecting to server",

   (gptr*) &opt_max_connect_retries, (gptr*) &opt_max_connect_retries, 0,

   GET_INT, REQUIRED_ARG, 5, 1, 10, 0, 0, 0},

  {"password", 'p', "Password to use when connecting to server.",

   0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},

  {"port", 'P', "Port number to use for connection.", (gptr*) &port,

extra/yassl/src/ssl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1080,7 +1080,7 @@ int X509_NAME_get_index_by_NID(X509_NAME* name,int nid, int lastpos) 


    switch (nid) {

    case NID_commonName:

        char* found = strstr(start, "/CN=");

        const char* found = strstr(start, "/CN=");

        if (found) {

            found += 4;  // advance to str

            idx = found - start + lastpos + 1;

sql-common/client.c

+5 −5
Original line number Diff line number Diff line
@@ -1611,8 +1611,8 @@ static int ssl_verify_server_cert(Vio *vio, const char* server_hostname) 
  cp1= strstr(buf, "/CN=");

  if (cp1)

  {

    cp1 += 4; // Skip the "/CN=" that we found

    // Search for next / which might be the delimiter for email

    cp1+= 4; /* Skip the "/CN=" that we found */

    /* Search for next / which might be the delimiter for email */

    cp2= strchr(cp1, '/');

    if (cp2)

      *cp2= '\0';