Commit 16d46c9c authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge 

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


BitKeeper/deleted/.del-client-req.pem~efd482e1d290d4d8:
  Auto merged
BitKeeper/deleted/.del-server-req.pem~16301893cacf1be4:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6:
  Auto merged
BitKeeper/deleted/.del-NOTES~e926d3e6929ac052:
  Auto merged
client/mysqltest.c:
  Auto merged
include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/std_data/cacert.pem:
  Auto merged
mysql-test/std_data/client-cert.pem:
  Auto merged
mysql-test/std_data/client-key.pem:
  Auto merged
mysql-test/std_data/server-cert.pem:
  Auto merged
mysql-test/std_data/server-key.pem:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Auto merged
vio/vio.c:
  Auto merged
client/client_priv.h:
  Merge 5.0 -> 5.1
include/violite.h:
  Merge 5.0 -> 5.1
mysql-test/Makefile.am:
  Merge 5.0 -> 5.1
mysql-test/t/disabled.def:
  Merge 5.0 -> 5.1
sql/mysqld.cc:
  Merge 5.0 -> 5.1
vio/viossl.c:
  Merge 5.0 -> 5.1
vio/viosslfactories.c:
  Merge 5.0 -> 5.1
parents 06045451 d6c2616c

client/client_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -58,5 +58,5 @@ enum options_client 
  OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,

  OPT_TZ_UTC, OPT_AUTO_CLOSE, OPT_CREATE_SLAP_SCHEMA,

  OPT_MYSQL_REPLACE_INTO, OPT_BASE64_OUTPUT, OPT_SERVER_ID,

  OPT_FIX_TABLE_NAMES, OPT_FIX_DB_NAMES

  OPT_FIX_TABLE_NAMES, OPT_FIX_DB_NAMES, OPT_SSL_VERIFY_SERVER_CERT

};

client/mysql.cc

+2 −0
Original line number Diff line number Diff line
@@ -3144,6 +3144,8 @@ sql_real_connect(char *host,char *database,char *user,char *password, 
  if (opt_use_ssl)

    mysql_ssl_set(&mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca,

		  opt_ssl_capath, opt_ssl_cipher);

  mysql_options(&mysql,MYSQL_OPT_SSL_VERIFY_SERVER_CERT,

                (char*)&opt_ssl_verify_server_cert);

#endif

  if (opt_protocol)

    mysql_options(&mysql,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol);

client/mysqladmin.cc

+2 −0
Original line number Diff line number Diff line
@@ -340,6 +340,8 @@ int main(int argc,char *argv[]) 
  if (opt_use_ssl)

    mysql_ssl_set(&mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca,

		  opt_ssl_capath, opt_ssl_cipher);

  mysql_options(&mysql,MYSQL_OPT_SSL_VERIFY_SERVER_CERT,

                (char*)&opt_ssl_verify_server_cert);

#endif

  if (opt_protocol)

    mysql_options(&mysql,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol);

client/mysqldump.c

+2 −0
Original line number Diff line number Diff line
@@ -918,6 +918,8 @@ static int dbConnect(char *host, char *user,char *passwd) 
  if (opt_use_ssl)

    mysql_ssl_set(&mysql_connection, opt_ssl_key, opt_ssl_cert, opt_ssl_ca,

		  opt_ssl_capath, opt_ssl_cipher);

  mysql_options(&mysql_connection,MYSQL_OPT_SSL_VERIFY_SERVER_CERT,

                (char*)&opt_ssl_verify_server_cert);

#endif

  if (opt_protocol)

    mysql_options(&mysql_connection,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol);

client/mysqlimport.c

+2 −0
Original line number Diff line number Diff line
@@ -406,6 +406,8 @@ static MYSQL *db_connect(char *host, char *database, 
  if (opt_use_ssl)

    mysql_ssl_set(mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca,

		  opt_ssl_capath, opt_ssl_cipher);

  mysql_options(&mysql_connection,MYSQL_OPT_SSL_VERIFY_SERVER_CERT,

                (char*)&opt_ssl_verify_server_cert);

#endif

  if (opt_protocol)

    mysql_options(mysql,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol);