Commit a994f984 authored by unknown's avatar unknown
Browse files

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/M50/mysql-5.0
parents 1baaa868 6692dcf7

client/mysql.cc

+2 −9
Original line number Diff line number Diff line
@@ -653,7 +653,7 @@ static struct my_option my_long_options[] = 
   "Base name of shared memory.", (gptr*) &shared_memory_base_name, (gptr*) &shared_memory_base_name, 

   0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

#endif

  {"socket", 'S', "Socket file to use for connection. (This will override --port unless --protocol=TCP is specified.)",

  {"socket", 'S', "Socket file to use for connection.",

   (gptr*) &opt_mysql_unix_port, (gptr*) &opt_mysql_unix_port, 0, GET_STR_ALLOC,

   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

#include "sslopt-longopts.h"
@@ -940,13 +940,6 @@ static int get_options(int argc, char **argv) 
    connect_flag= 0; /* Not in interactive mode */

  }

  

  if (opt_mysql_port && (!opt_protocol) && (!opt_mysql_unix_port))

  {

    /* Not checking return type since we are using a constant value */

    /* straight from the initialization of sql_protocol_typelib.    */

    opt_protocol= find_type("TCP", &sql_protocol_typelib, 0);

  }



  if (strcmp(default_charset, charset_info->csname) &&

      !(charset_info= get_charset_by_csname(default_charset, 

					    MY_CS_PRIMARY, MYF(MY_WME))))

extra/yassl/include/openssl/rsa.h

+1 −1
Original line number Diff line number Diff line 
/* rsa.h for openSSL */





#ifndef ysSSL_rsa_h__

#ifndef yaSSL_rsa_h__

#define yaSSL_rsa_h__



enum { RSA_F4 = 1 };

extra/yassl/include/openssl/ssl.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
 *

 */



#ifndef ysSSL_openssl_h__

#ifndef yaSSL_openssl_h__

#define yaSSL_openssl_h__



#include <stdio.h>   /* ERR_print fp */

extra/yassl/include/yassl_int.hpp

+0 −4
Original line number Diff line number Diff line
@@ -123,8 +123,6 @@ public: 


    friend sslFactory& GetSSL_Factory();        // singleton creator

private:

    static sslFactory instance_;



    sslFactory(const sslFactory&);              // hide copy

    sslFactory& operator=(const sslFactory&);   // and assign   

};
@@ -216,8 +214,6 @@ public: 


    friend Sessions& GetSessions(); // singleton creator

private:

    static Sessions instance_;



    Sessions(const Sessions&);              // hide copy

    Sessions& operator=(const Sessions&);   // and assign

};

extra/yassl/include/yassl_types.hpp

+5 −0
Original line number Diff line number Diff line
@@ -34,6 +34,11 @@ 


namespace yaSSL {





// Delete static singleton memory holders

void CleanUp();





// library allocation

struct new_t {};      // yaSSL New type

extern new_t ys;      // pass in parameter