Merge (830076cc) · Commits · Software / OSDI20 Artifacts / mariadb

Docs/manual.texi

+13 −3

Original line number	Diff line number	Diff line
		@@ -31071,6 +31071,10 @@ mysql> SELECT IF(STRCMP('test','test1'),'no','yes');
		-> 'no'
		@end example

		If @code{expr2} or @code{expr3} is explicitely @code{NULL} then the
		result type of the @code{IF()} function is the type of the not
		@code{NULL} column. (This behavior is new in MySQL 4.0.3).

		@code{expr1} is evaluated as an integer value, which means that if you are
		testing floating-point or string values, you should do so using a comparison
		operation:
		@@ -50246,10 +50250,13 @@ each individual 4.0.x release.
		Added @code{QUOTE()} function that performs SQL quoting to produce values
		that can be used as data values in queries.
		@item
		Fixed security bug in database hash
		Changed behavior of @code{IF(condition,column,NULL)} so that it returns
		the value of the column type.
		@item
		Made @code{safe_mysqld} a symlink to @code{mysqld_safe} in binary distribution.
		@item
		Fixed security bug when having an empty databasename in the user.db table.
		Fixed security bug when having an empty databasename in the @code{user.db}
		table.
		@item
		Fixed some problems with @code{CREATE TABLE ... SELECT function()}.
		@item
		@@ -50894,7 +50901,10 @@ not yet 100% confident in this code.
		@appendixsubsec Changes in release 3.23.52
		@itemize @bullet
		@item
		Fixed a security bug with empty db column in db table
		Fixed problem with @code{UNSIGNED BIGINT} on AIX.
		@item
		Fixed security bug when having an empty databasename in the @code{user.db}
		table.
		@item
		Changed initialisation of @code{RND()} to make it less predicatable.
		@item

include/my_no_pthread.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@
		environment, easier to use.
		*/

		#if !defined(_my_no_pthread_h) && !defined(THREADS)
		#if !defined(_my_no_pthread_h) && !defined(THREAD)
		#define _my_no_pthread_h

		#define pthread_mutex_init(A,B)

include/my_sys.h

+7 −8

Original line number	Diff line number	Diff line
		@@ -158,22 +158,21 @@ extern my_string my_strdup(const char *from,myf MyFlags);
		#define CALLER_INFO /* nothing */
		#define ORIG_CALLER_INFO /* nothing */
		#endif

		#ifdef HAVE_ALLOCA
		#ifdef __GNUC__
		/* Remove any previous definitions. */
		#undef alloca
		#define alloca(size) __builtin_alloca (size)
		#else /* xlc */
		#ifdef _AIX
		#if defined(_AIX) && !defined(__GNUC__)
		#pragma alloca
		#endif /* _AIX */
		#endif /* __GNUC__ */
		#if defined(__GNUC__) && !defined(HAVE_ALLOCA_H)
		#define alloca __builtin_alloca
		#endif /* GNUC */
		#define my_alloca(SZ) alloca((size_t) (SZ))
		#define my_afree(PTR) {}
		#else
		#define my_alloca(SZ) my_malloc(SZ,MYF(0))
		#define my_afree(PTR) my_free(PTR,MYF(MY_WME))
		#endif /* HAVE_ALLOCA */

		#ifdef MSDOS
		#ifdef __ZTC__
		void * __CDECL halloc(long count,size_t length);

innobase/include/os0thread.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -70,7 +70,9 @@ os_thread_create(
		void* arg, /* in: argument to start
		function */
		os_thread_id_t* thread_id); /* out: id of created
		thread */
		thread; currently this is
		identical to the handle to
		the thread */
		/*********************************************************************
		A thread calling this function ends its execution. */

innobase/include/trx0trx.h

+8 −1

Original line number	Diff line number	Diff line
		@@ -117,6 +117,13 @@ void
		trx_start_if_not_started(
		/=====================/
		trx_t* trx); /* in: transaction */
		/*****************************************************************
		Starts the transaction if it is not yet started. */

		void
		trx_start_if_not_started_noninline(
		/===============================/
		trx_t* trx); /* in: transaction */
		/********************************************************************
		Commits a transaction. */

		@@ -262,7 +269,7 @@ void
		trx_print(
		/======/
		char* buf, /* in/out: buffer where to print, must be at least
		500 bytes */
		800 bytes */
		trx_t* trx); /* in: transaction */