merge (5fa5172b) · Commits · Software / OSDI20 Artifacts / mariadb

.bzrignore

+8 −0

Original line number	Diff line number	Diff line
		@@ -472,3 +472,11 @@ vio/viotest-ssl
		mysys/getopt.c
		mysys/getopt1.c
		scripts/mysql_secure_installation
		mit-pthreads/include/bits
		mit-pthreads/include/pthread/machdep.h
		mit-pthreads/include/pthread/posix.h
		mit-pthreads/include/sys
		mit-pthreads/machdep.c
		mit-pthreads/pg++
		mit-pthreads/pgcc
		scripts/mysql_tableinfo

Docs/manual.texi

+7 −4

Original line number	Diff line number	Diff line
		@@ -3951,10 +3951,6 @@ Automatic output from @code{mysql} to Netscape.
		@item
		@code{LOCK DATABASES} (with various options.)
		@item
		@code{DECIMAL} and @code{NUMERIC} types can't read exponential numbers;
		@code{Field_decimal::store(const char *from,uint len)} must be recoded
		to fix this.
		@item
		Functions:
		ADD_TO_SET(value,set) and REMOVE_FROM_SET(value,set).
		@item
		@@ -49451,6 +49447,9 @@ Emulation of @code{pthread_mutex()} for OS/2.
		@item Benjamin Pflugmann
		Extended @code{MERGE} tables to handle @code{INSERTS}. Active member
		on the MySQL mailing lists.
		@item Guilhem Bichot
		Fixed handling of exponents for @code{DECIMAL}.
		Author of @code{mysql_tableinfo}.
		@end table

		Other contributors, bugfinders, and testers: James H. Thompson, Maurizio
		@@ -49579,6 +49578,10 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}.

		@itemize @bullet
		@item
		Removed @code{mysql_ssl_clear()}, as this was not needed.
		@item
		@code{DECIMAL} and @code{NUMERIC} types can now read exponential numbers.
		@item
		Added @code{SHA1()} function to calculate 160 bit hash value as described
		in RFC 3174 (Secure Hash Algorithm). This function can be considered a
		cryptographically more secure equivalent of @code{MD5()}.

include/mysql.h

+24 −17

Original line number	Diff line number	Diff line
		@@ -122,17 +122,17 @@ struct st_mysql_options {
		my_bool use_ssl; /* if to use SSL or not */
		my_bool compress,named_pipe;
		/*
		on connect, find out the replication role of the server, and
		On connect, find out the replication role of the server, and
		establish connections to all the peers
		*/
		my_bool rpl_probe;
		/*
		each call to mysql_real_query() will parse it to tell if it is a read
		Each call to mysql_real_query() will parse it to tell if it is a read
		or a write, and direct it to the slave or the master
		*/
		my_bool rpl_parse;
		/*
		if set, never read from a master,only from slave, when doing
		If set, never read from a master,only from slave, when doing
		a read that is replication-aware
		*/
		my_bool no_master_reads;
		@@ -185,8 +185,10 @@ typedef struct st_mysql {
		added though mysql_rpl_probe() or mysql_set_master()/ mysql_add_slave()
		*/
		my_bool rpl_pivot;
		/* pointers to the master, and the next slave
		connections, points to itself if lone connection */
		/*
		Pointers to the master, and the next slave connections, points to
		itself if lone connection.
		*/
		struct st_mysql* master, *next_slave;

		struct st_mysql* last_used_slave; /* needed for round-robin slave pick */
		@@ -234,21 +236,27 @@ typedef struct st_mysql_manager
		char last_error[MAX_MYSQL_MANAGER_ERR];
		} MYSQL_MANAGER;

		/* Set up and bring down the server; to ensure that applications will
		* work when linked against either the standard client library or the
		* embedded server library, these functions should be called. */
		/*
		Set up and bring down the server; to ensure that applications will
		work when linked against either the standard client library or the
		embedded server library, these functions should be called.
		*/
		int STDCALL mysql_server_init(int argc, char argv, char groups);
		void STDCALL mysql_server_end(void);

		/* Set up and bring down a thread; these function should be called
		* for each thread in an application which opens at least one MySQL
		* connection. All uses of the connection(s) should be between these
		* function calls. */
		/*
		Set up and bring down a thread; these function should be called
		for each thread in an application which opens at least one MySQL
		connection. All uses of the connection(s) should be between these
		function calls.
		*/
		my_bool STDCALL mysql_thread_init(void);
		void STDCALL mysql_thread_end(void);

		/* Functions to get information from the MYSQL and MYSQL_RES structures */
		/* Should definitely be used if one uses shared libraries */
		/*
		Functions to get information from the MYSQL and MYSQL_RES structures
		Should definitely be used if one uses shared libraries.
		*/

		my_ulonglong STDCALL mysql_num_rows(MYSQL_RES *res);
		unsigned int STDCALL mysql_num_fields(MYSQL_RES *res);
		@@ -272,7 +280,6 @@ MYSQL * STDCALL mysql_init(MYSQL *mysql);
		int STDCALL mysql_ssl_set(MYSQL mysql, const char key,
		const char cert, const char ca,
		const char capath, const char cipher);
		int STDCALL mysql_ssl_clear(MYSQL *mysql);
		my_bool STDCALL mysql_change_user(MYSQL mysql, const char user,
		const char passwd, const char db);
		MYSQL * STDCALL mysql_real_connect(MYSQL mysql, const char host,

include/thr_alarm.h

+9 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,15 @@ extern "C" {
		#define THR_SERVER_ALARM SIGALRM
		#endif

		typedef struct st_alarm_info
		{
		ulong next_alarm_time;
		uint active_alarms;
		uint max_used_alarms;
		} ALARM_INFO;

		void thr_alarm_info(ALARM_INFO *info);

		#if defined(DONT_USE_THR_ALARM) \|\| !defined(THREAD)

		#define USE_ALARM_THREAD

libmysql/libmysql.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1448,8 +1448,8 @@ mysql_ssl_set(MYSQL *mysql __attribute__((unused)) ,
		NB! Errors are not reported until you do mysql_real_connect.
		**************************************************************************/

		int STDCALL
		mysql_ssl_clear(MYSQL *mysql __attribute__((unused)))
		static int
		mysql_ssl_free(MYSQL *mysql __attribute__((unused)))
		{
		#ifdef HAVE_OPENSSL
		my_free(mysql->options.ssl_key, MYF(MY_ALLOW_ZERO_PTR));
		@@ -2051,7 +2051,7 @@ mysql_close(MYSQL *mysql)
		my_free(mysql->options.charset_dir,MYF(MY_ALLOW_ZERO_PTR));
		my_free(mysql->options.charset_name,MYF(MY_ALLOW_ZERO_PTR));
		#ifdef HAVE_OPENSSL
		mysql_ssl_clear(mysql);
		mysql_ssl_free(mysql);
		#endif /* HAVE_OPENSSL */
		/* Clear pointers for better safety */
		mysql->host_info=mysql->user=mysql->passwd=mysql->db=0;