Merge (5ee7d7e7) · Commits · Software / OSDI20 Artifacts / mariadb

Docs/manual.texi

+30 −2

Original line number	Diff line number	Diff line
		@@ -16570,6 +16570,7 @@ GRANT priv_type [(column_list)] [, priv_type [(column_list)] ...]
		TO user_name [IDENTIFIED BY [PASSWORD] 'password']
		[, user_name [IDENTIFIED BY 'password'] ...]
		[REQUIRE
		NONE \|
		[@{SSL\| X509@}]
		[CIPHER cipher [AND]]
		[ISSUER issuer [AND]]
		@@ -17645,6 +17646,9 @@ mysql> GRANT ALL PRIVILEGES ON test.* TO root@@localhost
		-> AND CIPHER "EDH-RSA-DES-CBC3-SHA";
		@end example

		Starting from MySQL 4.0.4 the @code{AND} keyword is optional between
		@code{REQUIRE} options.

		The order of the options does not matter, but no option can be specified
		twice.
		@end itemize
		@@ -46618,7 +46622,8 @@ Copy this file to some directory searched by @code{ld}, such as
		@code{LD_LIBRARY_PATH} environment variable to point at the directory where
		you have your UDF function files. The @code{dlopen} manual page tells you
		which variable you should use on your system. You should set this in
		@code{mysql.server} or @code{safe_mysqld} and restart @code{mysqld}.
		@code{mysql.server} or @code{safe_mysqld} startup scripts and restart
		@code{mysqld}.

		After the library is installed, notify @code{mysqld} about the new
		functions with these commands:
		@@ -50386,6 +50391,29 @@ each individual 4.0.x release.

		@itemize @bullet
		@item
		@code{--log-binary=a.b.c} now properly strips of @code{.b.c}.
		@item
		@code{FLUSH LOGS} removed numerical extension for all future update logs.
		@item
		@code{GRANT ... REQUIRE} didn't store the SSL information in the
		@code{mysql.user} table if SSL was not enabled in the server.
		@item
		@code{GRANT ... REQUIRE NONE} can now be used to remove SSL information.
		@item
		@code{AND} is not optional between @code{REQUIRE} options.
		@item
		@code{REQUIRE} options was not properly saved, which could cause strange
		output in @code{SHOW GRANTS}.
		@item
		Fixed that @code{mysqld --help} reports right values for @code{--datadir} and
		@code{--bind-address}.
		@item
		Fixed that one can drop UDF functions that didn't exists when mysqld was
		started.
		@item
		Fixed core dump problem with @code{SHOW VARIABLES} on some 64 bit systems
		(like Solaris sparc).
		@item
		Fixed a bug in my_getopt; --set-variable syntax didn't work for
		those options that didn't have a valid variable in my_option struct.
		This affected at least @code{default-table-type} option.
		@@ -51118,7 +51146,7 @@ not yet 100% confident in this code.
		@itemize @bullet
		@item
		Changed @code{AND/OR} to report that they can return NULL. This fixes a
		small problem in @code{GROUP BY} on @code{AND/OR} expression that return
		bug in @code{GROUP BY} on @code{AND/OR} expression that return
		@code{NULL}.
		@item
		Fixed a bug that @code{OPTIMIZE} of locked and modified MyISAM table,

acinclude.m4

+6 −6

Original line number	Diff line number	Diff line
		@@ -701,10 +701,10 @@ AC_DEFUN(MYSQL_CHECK_VIO, [
		])

		AC_DEFUN(MYSQL_FIND_OPENSSL, [
		for d in /usr/ssl/include /usr/local/ssl/include /usr/include/openssl \
		for d in /usr/ssl/include /usr/local/ssl/include /usr/include \
		/usr/include/ssl /opt/ssl/include /opt/openssl/include \
		/usr/local/ssl/include/openssl /usr/local/include/openssl ; do
		if test -f $d/ssl.h ; then
		/usr/local/ssl/include /usr/local/include ; do
		if test -f $d/openssl/ssl.h ; then
		OPENSSL_INCLUDE=$d
		fi
		done

client/Makefile.am

+2 −2

Original line number	Diff line number	Diff line
		@@ -16,9 +16,9 @@

		# This file is public domain and comes with NO WARRANTY of any kind

		INCLUDES = -I$(srcdir)/../include $(openssl_includes) \
		INCLUDES = -I$(srcdir)/../include \
		-I../include -I$(srcdir)/.. -I$(top_srcdir) \
		-I..
		-I.. $(openssl_includes)
		LIBS = @CLIENT_LIBS@
		LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysql/libmysqlclient.la
		bin_PROGRAMS = mysql mysqladmin mysqlcheck mysqlshow \

include/Makefile.am

+3 −3

Original line number	Diff line number	Diff line
		@@ -20,14 +20,14 @@ pkginclude_HEADERS = dbug.h m_string.h my_sys.h my_list.h \
		mysql.h mysql_com.h mysqld_error.h mysql_embed.h \
		my_semaphore.h my_pthread.h my_no_pthread.h raid.h \
		errmsg.h my_global.h my_net.h my_alloc.h \
		sslopt-longopts.h sslopt-usage.h \
		my_getopt.h sslopt-longopts.h sslopt-usage.h \
		sslopt-vars.h $(BUILT_SOURCES)
		noinst_HEADERS = config-win.h config-os2.h \
		nisam.h heap.h merge.h my_bitmap.h\
		myisam.h myisampack.h myisammrg.h ft_global.h\
		my_dir.h mysys_err.h my_base.h \
		my_nosys.h my_alarm.h queues.h rijndael.h sha1.h \
		my_aes.h my_getopt.h my_tree.h hash.h thr_alarm.h \
		my_aes.h my_tree.h hash.h thr_alarm.h \
		thr_lock.h t_ctype.h violite.h md5.h mysql_version.h.in

		# mysql_version.h are generated

include/violite.h

+8 −1

Original line number	Diff line number	Diff line
		@@ -193,7 +193,14 @@ Vio* new_VioSSL(struct st_VioSSLAcceptorFd* fd, Vio* sd,int state);
		#endif /* HAVE_OPENSSL */

		/* This enumerator is used in parser - should be always visible */
		enum SSL_type {SSL_TYPE_NONE, SSL_TYPE_ANY, SSL_TYPE_X509, SSL_TYPE_SPECIFIED};
		enum SSL_type
		{
		SSL_TYPE_NOT_SPECIFIED= -1,
		SSL_TYPE_NONE,
		SSL_TYPE_ANY,
		SSL_TYPE_X509,
		SSL_TYPE_SPECIFIED
		};

		#ifndef EMBEDDED_LIBRARY
		/* This structure is for every connection on both sides */