Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 (ed7e869b) · Commits · Software / OSDI20 Artifacts / mariadb

include/my_pthread.h

+4 −2

Original line number	Diff line number	Diff line
		@@ -332,12 +332,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

mysql-test/r/func_str.result

+6 −0

Original line number	Diff line number	Diff line
		@@ -1046,4 +1046,10 @@ cast(ltrim(' 20.06 ') as decimal(19,2))
		select cast(rtrim(ltrim(' 20.06 ')) as decimal(19,2));
		cast(rtrim(ltrim(' 20.06 ')) as decimal(19,2))
		20.06
		select conv("18383815659218730760",10,10) + 0;
		conv("18383815659218730760",10,10) + 0
		1.8383815659219e+19
		select "18383815659218730760" + 0;
		"18383815659218730760" + 0
		1.8383815659219e+19
		End of 5.0 tests

mysql-test/r/having.result

+1 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ explain extended select count(a) as b from t1 where a=0 having b >=0;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables
		Warnings:
		Note 1003 select count(`test`.`t1`.`a`) AS `b` from `test`.`t1` where 0 having (count(`test`.`t1`.`a`) >= 0)
		Note 1003 select count(`test`.`t1`.`a`) AS `b` from `test`.`t1` where 0 having (`b` >= 0)
		drop table t1;
		CREATE TABLE t1 (
		raw_id int(10) NOT NULL default '0',