Commit 719bfafc authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-5.0-1039 

into  mysql.com:/home/jimw/my/mysql-5.0-clean


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
include/sslopt-longopts.h:
  Resolve conflict
include/sslopt-vars.h:
  Resolve conflict
mysql-test/r/variables.result:
  Resolve conflict
mysql-test/t/variables.test:
  Resolve conflict
parents 8dff422f c06972bf

include/sslopt-longopts.h

+6 −6
Original line number Diff line number Diff line
@@ -20,12 +20,6 @@ 
   "Enable SSL for connection (automatically enabled with other flags). Disable with --skip-ssl.",

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

   0, 0, 0},

  {"ssl-key", OPT_SSL_KEY, "X509 key in PEM format (implies --ssl).",

   (gptr*) &opt_ssl_key, (gptr*) &opt_ssl_key, 0, GET_STR, REQUIRED_ARG,

   0, 0, 0, 0, 0, 0},

  {"ssl-cert", OPT_SSL_CERT, "X509 cert in PEM format (implies --ssl).",

   (gptr*) &opt_ssl_cert, (gptr*) &opt_ssl_cert, 0, GET_STR, REQUIRED_ARG,

   0, 0, 0, 0, 0, 0},

  {"ssl-ca", OPT_SSL_CA,

   "CA file in PEM format (check OpenSSL docs, implies --ssl).",

   (gptr*) &opt_ssl_ca, (gptr*) &opt_ssl_ca, 0, GET_STR, REQUIRED_ARG,
@@ -34,9 +28,15 @@ 
   "CA directory (check OpenSSL docs, implies --ssl).",

   (gptr*) &opt_ssl_capath, (gptr*) &opt_ssl_capath, 0, GET_STR, REQUIRED_ARG,

   0, 0, 0, 0, 0, 0},

  {"ssl-cert", OPT_SSL_CERT, "X509 cert in PEM format (implies --ssl).",

   (gptr*) &opt_ssl_cert, (gptr*) &opt_ssl_cert, 0, GET_STR, REQUIRED_ARG,

   0, 0, 0, 0, 0, 0},

  {"ssl-cipher", OPT_SSL_CIPHER, "SSL cipher to use (implies --ssl).",

   (gptr*) &opt_ssl_cipher, (gptr*) &opt_ssl_cipher, 0, GET_STR, REQUIRED_ARG,

   0, 0, 0, 0, 0, 0},

  {"ssl-key", OPT_SSL_KEY, "X509 key in PEM format (implies --ssl).",

   (gptr*) &opt_ssl_key, (gptr*) &opt_ssl_key, 0, GET_STR, REQUIRED_ARG,

   0, 0, 0, 0, 0, 0},

#ifdef MYSQL_CLIENT

  {"ssl-verify-server-cert", OPT_SSL_VERIFY_SERVER_CERT,

   "Verify server's \"Common Name\" in its cert against hostname used when connecting. This option is disabled by default.",

include/sslopt-vars.h

+12 −7
Original line number Diff line number Diff line
@@ -15,13 +15,18 @@ 
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */



#ifdef HAVE_OPENSSL

static my_bool opt_use_ssl  = 0;

static char *opt_ssl_key    = 0;

static char *opt_ssl_cert   = 0;

static char *opt_ssl_ca     = 0;

static char *opt_ssl_capath = 0;

static char *opt_ssl_cipher = 0;

#ifdef SSL_VARS_NOT_STATIC

#define SSL_STATIC

#else

#define SSL_STATIC static

#endif

SSL_STATIC my_bool opt_use_ssl  = 0;

SSL_STATIC char *opt_ssl_ca     = 0;

SSL_STATIC char *opt_ssl_capath = 0;

SSL_STATIC char *opt_ssl_cert   = 0;

SSL_STATIC char *opt_ssl_cipher = 0;

SSL_STATIC char *opt_ssl_key    = 0;

#ifdef MYSQL_CLIENT

static my_bool opt_ssl_verify_server_cert= 0;

SSL_STATIC my_bool opt_ssl_verify_server_cert= 0;

#endif

#endif

mysql-test/r/variables.result

+29 −1
Original line number Diff line number Diff line
@@ -639,6 +639,35 @@ select @@version, @@version_comment, @@version_compile_machine, 
@@version_compile_os;

@@version	@@version_comment	@@version_compile_machine	@@version_compile_os

#	#	#	#

select @@basedir, @@datadir, @@tmpdir;

@@basedir	@@datadir	@@tmpdir

#	#	#

show variables like 'basedir';

Variable_name	Value

basedir	#

show variables like 'datadir';

Variable_name	Value

datadir	#

show variables like 'tmpdir';

Variable_name	Value

tmpdir	#

select @@ssl_ca, @@ssl_capath, @@ssl_cert, @@ssl_cipher, @@ssl_key;

@@ssl_ca	@@ssl_capath	@@ssl_cert	@@ssl_cipher	@@ssl_key

#	#	#	#	#

show variables like 'ssl%';

Variable_name	Value

ssl_ca	#

ssl_capath	#

ssl_cert	#

ssl_cipher	#

ssl_key	#

select @@log_queries_not_using_indexes;

@@log_queries_not_using_indexes

0

show variables like 'log_queries_not_using_indexes';

Variable_name	Value

log_queries_not_using_indexes	OFF

End of 5.0 tests

set global binlog_cache_size         =@my_binlog_cache_size;

set global connect_timeout           =@my_connect_timeout;

set global delayed_insert_timeout    =@my_delayed_insert_timeout;
@@ -666,4 +695,3 @@ set global server_id =@my_server_id; 
set global slow_launch_time          =@my_slow_launch_time;

set global storage_engine            =@my_storage_engine;

set global thread_cache_size         =@my_thread_cache_size;
 
End of 5.0 tests

mysql-test/t/variables.test

+36 −3
Original line number Diff line number Diff line
@@ -540,7 +540,42 @@ select @@version, @@version_comment, @@version_compile_machine, 
       @@version_compile_os;



#

# Bug #19263: variables.test doesn't clean up after itself (II/II -- restore)

# Bug #1039: make tmpdir and datadir available as @@variables (also included

# basedir)

#

# Don't actually output, since it depends on the system

--replace_column 1 # 2 # 3 #

select @@basedir, @@datadir, @@tmpdir;

--replace_column 2 #

show variables like 'basedir';

--replace_column 2 #

show variables like 'datadir';

--replace_column 2 #

show variables like 'tmpdir';



#

# Bug #19606: make ssl settings available via SHOW VARIABLES and @@variables

# 

# Don't actually output, since it depends on the system

--replace_column 1 # 2 # 3 # 4 # 5 #

select @@ssl_ca, @@ssl_capath, @@ssl_cert, @@ssl_cipher, @@ssl_key;

--replace_column 2 #

show variables like 'ssl%';



#

# Bug #19616: make log_queries_not_using_indexes available in SHOW VARIABLES

# and as @@log_queries_not_using_indexes

#

select @@log_queries_not_using_indexes;

show variables like 'log_queries_not_using_indexes';



--echo End of 5.0 tests



# This is at the very after the versioned tests, since it involves doing

# cleanup

#

# Bug #19263: variables.test doesn't clean up after itself (II/II --

# restore)

#

set global binlog_cache_size         =@my_binlog_cache_size;

set global connect_timeout           =@my_connect_timeout;
@@ -569,5 +604,3 @@ set global server_id =@my_server_id; 
set global slow_launch_time          =@my_slow_launch_time;

set global storage_engine            =@my_storage_engine;

set global thread_cache_size         =@my_thread_cache_size;
 


--echo End of 5.0 tests

sql/mysql_priv.h

+1 −0
Original line number Diff line number Diff line
@@ -1179,6 +1179,7 @@ extern my_bool locked_in_memory; 
extern bool opt_using_transactions, mysqld_embedded;

extern bool using_update_log, opt_large_files, server_id_supplied;

extern bool opt_log, opt_update_log, opt_bin_log, opt_slow_log, opt_error_log;

extern my_bool opt_log_queries_not_using_indexes;

extern bool opt_disable_networking, opt_skip_show_db;

extern my_bool opt_character_set_client_handshake;

extern bool volatile abort_loop, shutdown_in_progress, grant_option;