Commit 4a5e9e31 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


mysql-test/r/rpl_ndb_basic.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
parents 6d9d64ba 37feda25

client/client_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -67,5 +67,5 @@ enum options_client 
  OPT_SLAP_POST_QUERY,

  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);

client/mysqldump.c

+345 −253

File changed.

Preview size limit exceeded, changes collapsed.

client/mysqltest.c

+3 −5
Original line number Diff line number Diff line
@@ -3540,7 +3540,7 @@ void do_connect(struct st_command *command) 
		  opt_ssl_capath, opt_ssl_cipher);

#if MYSQL_VERSION_ID >= 50000

    /* Turn on ssl_verify_server_cert only if host is "localhost" */

    opt_ssl_verify_server_cert= !strcmp(ds_connection_name.str, "localhost");

    opt_ssl_verify_server_cert= !strcmp(ds_host.str, "localhost");

    mysql_options(&next_con->mysql, MYSQL_OPT_SSL_VERIFY_SERVER_CERT,

                  &opt_ssl_verify_server_cert);

#endif
@@ -6012,15 +6012,13 @@ int main(int argc, char **argv) 


#ifdef HAVE_OPENSSL



#if MYSQL_VERSION_ID >= 50000

  opt_ssl_verify_server_cert= TRUE; /* Always on in mysqltest */

#endif



  if (opt_use_ssl)

  {

    mysql_ssl_set(&cur_con->mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca,

		  opt_ssl_capath, opt_ssl_cipher);

#if MYSQL_VERSION_ID >= 50000

    /* Turn on ssl_verify_server_cert only if host is "localhost" */

    opt_ssl_verify_server_cert= opt_host && !strcmp(opt_host, "localhost");

    mysql_options(&cur_con->mysql, MYSQL_OPT_SSL_VERIFY_SERVER_CERT,

                  &opt_ssl_verify_server_cert);

#endif

extra/yassl/README

+8 −0
Original line number Diff line number Diff line 
*****************yaSSL Release notes, version 1.6.0 (2/22/07)



    This release of yaSSL contains bug fixes, portability enhancements, and

    better X509 support.



See normal  build instructions below under 1.0.6.

See libcurl build instructions below under 1.3.0 and note in 1.5.8.



*****************yaSSL Release notes, version 1.5.8 (1/10/07)



    This release of yaSSL contains bug fixes, portability enhancements, and