Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new (e4e2d029) · Commits · Software / OSDI20 Artifacts / mariadb

client/mysql.cc

+0 −1

Original line number	Diff line number	Diff line
		@@ -2346,7 +2346,6 @@ print_table_data(MYSQL_RES *result)
		uint visible_length;
		uint extra_padding;

		/* If this column may have a null value, use "NULL" for empty. */
		if (! not_null_flag[off] && (cur[off] == NULL))
		{
		buffer= "NULL";

configure.in

+4 −23

Original line number	Diff line number	Diff line
		@@ -1087,7 +1087,7 @@ dnl Is this the right match for DEC OSF on alpha?
		# Edit Makefile.in files.
		#
		echo -n "configuring Makefile.in files for NetWare... "
		for file in sql/Makefile.in libmysql/Makefile.in libmysql_r/Makefile.in sql/share/Makefile.in strings/Makefile.in client/Makefile.in
		for file in sql/Makefile.in extra/Makefile.in client/Makefile.in
		do
		# echo "#### $file ####"
		filedir="`dirname $file`"
		@@ -1108,32 +1108,13 @@ dnl Is this the right match for DEC OSF on alpha?
		# Add library dependencies to mysqld_DEPENDENCIES
		lib_DEPENDENCIES="\$(pstack_libs) \$(openssl_libs) \$(yassl_libs)"
		cat > $filesed << EOF
		s,$^.*\$(MAKE) gen_lex_hash$\$(EXEEXT),#\1,
		s,$\./gen_lex_hash$\$(EXEEXT),\1.linux,
		s%$mysqld_DEPENDENCIES = $%\1$lib_DEPENDENCIES %
		EOF
		;;
		sql/share/Makefile.in)
		extra/Makefile.in)
		cat > $filesed << EOF
		s,$extra/comp_err$,\1.linux,
		EOF
		;;
		libmysql/Makefile.in)
		cat > $filesed << EOF
		s,$\./conf_to_src$$ \$(top_srcdir)$,\1.linux\2,
		s,$: conf_to_src$,\1.linux,
		EOF
		;;
		libmysql_r/Makefile.in)
		cat > $filesed << EOF
		s,$\./conf_to_src$$ \$(top_srcdir)$,\1.linux\2,
		s,$: conf_to_src$,\1.linux,
		EOF
		;;
		strings/Makefile.in)
		cat > $filesed << EOF
		s,$\./conf_to_src$$ \$(top_srcdir)$,\1.linux\2,
		s,$: conf_to_src$,\1.linux,
		s,$extra/comp_err$\$(EXEEXT),\1.linux,
		EOF
		;;
		client/Makefile.in)

include/my_pthread.h

+4 −2

Original line number	Diff line number	Diff line
		@@ -226,12 +226,14 @@ int sigwait(sigset_t setp, int sigp); /* Use our implemention */
		we want to make sure that no such flags are set.
		*/
		#if defined(HAVE_SIGACTION) && !defined(my_sigset)
		#define my_sigset(A,B) do { struct sigaction s; sigset_t set; \
		#define my_sigset(A,B) do { struct sigaction s; sigset_t set; int rc; \
		DBUG_ASSERT((A) != 0); \
		sigemptyset(&set); \
		s.sa_handler = (B); \
		s.sa_mask = set; \
		s.sa_flags = 0; \
		sigaction((A), &s, (struct sigaction *) NULL); \
		rc= sigaction((A), &s, (struct sigaction *) NULL);\
		DBUG_ASSERT(rc == 0); \
		} while (0)
		#elif defined(HAVE_SIGSET) && !defined(my_sigset)
		#define my_sigset(A,B) sigset((A),(B))

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