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

Merge pilot.blaudden:/home/msvensson/mysql/bug24121/my51-bug24121 

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
parents 3556deeb 8d77dcbb

client/client_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -60,5 +60,5 @@ enum options_client 
  OPT_SLAP_AUTO_GENERATE_SQL_LOAD_TYPE, OPT_SLAP_AUTO_GENERATE_WRITE_NUM,

  OPT_MYSQL_REPLACE_INTO, OPT_BASE64_OUTPUT, OPT_SERVER_ID,

  OPT_FIX_TABLE_NAMES, OPT_FIX_DB_NAMES, OPT_SSL_VERIFY_SERVER_CERT,

  OPT_DEBUG_INFO, OPT_COLUMN_TYPES

  OPT_DEBUG_INFO, OPT_COLUMN_TYPES, OPT_WRITE_BINLOG

};

client/mysqlcheck.c

+9 −4
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ static my_bool opt_alldbs = 0, opt_check_only_changed = 0, opt_extended = 0, 
               opt_medium_check = 0, opt_quick = 0, opt_all_in_1 = 0,

               opt_silent = 0, opt_auto_repair = 0, ignore_errors = 0,

               tty_password= 0, opt_frm= 0, info_flag= 0, 

               opt_fix_table_names= 0, opt_fix_db_names= 0, opt_upgrade= 0;

               opt_fix_table_names= 0, opt_fix_db_names= 0, opt_upgrade= 0,

               opt_write_binlog= 1;

static uint verbose = 0, opt_mysql_port=0;

static my_string opt_mysql_unix_port = 0;

static char *opt_password = 0, *current_user = 0,
@@ -123,6 +124,10 @@ static struct my_option my_long_options[] = 
  {"medium-check", 'm',

   "Faster than extended-check, but only finds 99.99 percent of all errors. Should be good enough for most cases.",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"write-binlog", OPT_WRITE_BINLOG,

   "Log ANALYZE, OPTIMIZE and REPAIR TABLE commands. Enabled by default; use --skip-write-binlog when commands should not be sent to replication slaves.",

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

   1, 0, 0, 0, 0, 0},

  {"optimize", 'o', "Optimize table.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0,

   0, 0},

  {"password", 'p',
@@ -598,16 +603,16 @@ static int handle_request_for_tables(char *tables, uint length) 
    if (opt_upgrade)            end = strmov(end, " FOR UPGRADE");

    break;

  case DO_REPAIR:

    op = "REPAIR";

    op= (opt_write_binlog) ? "REPAIR" : "REPAIR NO_WRITE_TO_BINLOG";

    if (opt_quick)              end = strmov(end, " QUICK");

    if (opt_extended)           end = strmov(end, " EXTENDED");

    if (opt_frm)                end = strmov(end, " USE_FRM");

    break;

  case DO_ANALYZE:

    op = "ANALYZE";

    op= (opt_write_binlog) ? "ANALYZE" : "ANALYZE NO_WRITE_TO_BINLOG";

    break;

  case DO_OPTIMIZE:

    op = "OPTIMIZE";

    op= (opt_write_binlog) ? "OPTIMIZE" : "OPTIMIZE NO_WRITE_TO_BINLOG";

    break;

  case DO_UPGRADE:

    return fix_object_name("TABLE", tables);

extra/yassl/include/lock.hpp

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ namespace yaSSL { 




#ifdef MULTI_THREADED

   #if defined(_WIN32) || defined(_WIN64)

    #ifdef _WIN32

        #include <windows.h>



        class Mutex {

extra/yassl/include/openssl/ssl.h

+8 −1
Original line number Diff line number Diff line
@@ -190,10 +190,17 @@ enum { /* ERR Constants */ 
    EVP_R_BAD_DECRYPT = 2

};



/*

  Allow type used by SSL_set_fd to be changed, default to int

  in order to be compatible with OpenSSL

 */

#ifndef YASSL_SOCKET_T_DEFINED

typedef int YASSL_SOCKET_T;

#endif



SSL_CTX* SSL_CTX_new(SSL_METHOD*);

SSL* SSL_new(SSL_CTX*);

int  SSL_set_fd (SSL*, int);

int  SSL_set_fd (SSL*, YASSL_SOCKET_T);

int  SSL_connect(SSL*);

int  SSL_write(SSL*, const void*, int);

int  SSL_read(SSL*, void*, int);

extra/yassl/include/socket_wrapper.hpp

+3 −2
Original line number Diff line number Diff line
@@ -28,8 +28,9 @@ 


#include <assert.h>



#include "openssl/ssl.h"                        /* for socket_t */

#if !defined(_WIN32) && !defined(_WIN64)

#ifdef _WIN32

    #include <winsock2.h>

#else 

    #include <sys/time.h>

    #include <sys/types.h>

    #include <sys/socket.h>