Merge pzaitsev@work.mysql.com:/home/bk/mysql-4.0 (8238d98b) · Commits · Software / OSDI20 Artifacts / mariadb

include/errmsg.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -61,3 +61,4 @@ extern const char client_errors[]; / Error messages */
		#define CR_PROBE_SLAVE_HOSTS 2023
		#define CR_PROBE_SLAVE_CONNECT 2024
		#define CR_PROBE_MASTER_CONNECT 2025
		#define CR_SSL_CONNECTION_ERROR 2026

include/violite.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -174,7 +174,7 @@ struct st_VioSSLConnectorFd
		SSL_METHOD* ssl_method_;
		};

		void sslaccept(struct st_VioSSLAcceptorFd, Vio, long timeout);
		int sslaccept(struct st_VioSSLAcceptorFd, Vio, long timeout);
		int sslconnect(struct st_VioSSLConnectorFd, Vio, long timeout);

		struct st_VioSSLConnectorFd
		@@ -231,7 +231,6 @@ struct st_vio

		#ifdef HAVE_OPENSSL
		SSL* ssl_;
		my_bool open_;
		#endif /* HAVE_OPENSSL */
		#endif /* HAVE_VIO */
		};

libmysql/errmsg.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -49,7 +49,8 @@ const char *client_errors[]=
		"Error on SHOW SLAVE STATUS:",
		"Error on SHOW SLAVE HOSTS:",
		"Error connecting to slave:",
		"Error connecting to master:"
		"Error connecting to master:",
		"SSL connection error"
		};

		/* Start of code added by Roberto M. Serqueira - martinsc@uol.com.br - 05.24.2001 */
		@@ -82,7 +83,8 @@ const char *client_errors[]=
		"Error on SHOW SLAVE STATUS:",
		"Error on SHOW SLAVE HOSTS:",
		"Error connecting to slave:",
		"Error connecting to master:"
		"Error connecting to master:",
		"SSL connection error"
		};

		#else /* ENGLISH */
		@@ -113,7 +115,8 @@ const char *client_errors[]=
		"Error on SHOW SLAVE STATUS:",
		"Error on SHOW SLAVE HOSTS:",
		"Error connecting to slave:",
		"Error connecting to master:"
		"Error connecting to master:",
		"SSL connection error"
		};
		#endif

libmysql/libmysql.c

+8 −5

Original line number	Diff line number	Diff line
		@@ -1872,15 +1872,18 @@ mysql_real_connect(MYSQL mysql,const char host, const char *user,
		options->ssl_capath,
		options->ssl_cipher)))
		{
		/* TODO: Change to SSL error */
		net->last_errno= CR_SERVER_LOST;
		net->last_errno= CR_SSL_CONNECTION_ERROR;
		strmov(net->last_error,ER(net->last_errno));
		goto error;
		}
		DBUG_PRINT("info", ("IO layer change in progress..."));
		/* TODO: Add proper error checking here, with return error message */
		sslconnect((struct st_VioSSLConnectorFd*)(mysql->connector_fd),
		mysql->net.vio, (long) (mysql->options.connect_timeout));
		if(sslconnect((struct st_VioSSLConnectorFd*)(mysql->connector_fd),
		mysql->net.vio, (long) (mysql->options.connect_timeout)))
		{
		net->last_errno= CR_SSL_CONNECTION_ERROR;
		strmov(net->last_error,ER(net->last_errno));
		goto error;
		}
		DBUG_PRINT("info", ("IO layer change done!"));
		}
		#endif /* HAVE_OPENSSL */

sql/mysqld.cc

+12 −3

Original line number	Diff line number	Diff line
		@@ -339,7 +339,7 @@ volatile ulong cached_thread_count=0;
		my_string master_user = (char*) "test", master_password = 0, master_host=0,
		master_info_file = (char*) "master.info",
		relay_log_info_file = (char*) "relay-log.info",
		master_ssl_key=0, master_ssl_cert=0;
		master_ssl_key=0, master_ssl_cert=0, master_ssl_capath=0, master_ssl_cipher=0;
		my_string report_user = 0, report_password = 0, report_host=0;

		const char *localhost=LOCAL_HOST;
		@@ -2820,7 +2820,8 @@ enum options {
		OPT_MASTER_INFO_FILE, OPT_MASTER_CONNECT_RETRY,
		OPT_MASTER_RETRY_COUNT,
		OPT_MASTER_SSL, OPT_MASTER_SSL_KEY,
		OPT_MASTER_SSL_CERT,
		OPT_MASTER_SSL_CERT, OPT_MASTER_SSL_CAPATH,
		OPT_MASTER_SSL_CIPHER,
		OPT_SQL_BIN_UPDATE_SAME, OPT_REPLICATE_DO_DB,
		OPT_REPLICATE_IGNORE_DB, OPT_LOG_SLAVE_UPDATES,
		OPT_BINLOG_DO_DB, OPT_BINLOG_IGNORE_DB,
		@@ -3129,6 +3130,14 @@ struct my_option my_long_options[] =
		"Master SSL certificate file name. Only applies if you have enabled master-ssl.",
		(gptr) &master_ssl_cert, (gptr) &master_ssl_cert, 0, GET_STR, OPT_ARG,
		0, 0, 0, 0, 0, 0},
		{"master-ssl-capath", OPT_MASTER_SSL_CAPATH,
		"Master SSL CA path. Only applies if you have enabled master-ssl.",
		(gptr) &master_ssl_capath, (gptr) &master_ssl_capath, 0, GET_STR, OPT_ARG,
		0, 0, 0, 0, 0, 0},
		{"master-ssl-cipher", OPT_MASTER_SSL_CIPHER,
		"Master SSL cipher. Only applies if you have enabled master-ssl.",
		(gptr) &master_ssl_cipher, (gptr) &master_ssl_capath, 0, GET_STR, OPT_ARG,
		0, 0, 0, 0, 0, 0},
		{"myisam-recover", OPT_MYISAM_RECOVER,
		"Syntax: myisam-recover[=option[,option...]], where option can be DEFAULT, BACKUP or FORCE.",
		(gptr) &myisam_recover_options_str, (gptr) &myisam_recover_options_str, 0,