Merge from trunk. (38ae5d10) · Commits · Software / OSDI20 Artifacts / mariadb

Makefile.am

+2 −2

Original line number	Diff line number	Diff line
		@@ -154,7 +154,7 @@ test-bt:
		-cd mysql-test ; MTR_BUILD_THREAD=auto \
		@PERL@ ./mysql-test-run.pl --force --comment=ps --ps-protocol
		-cd mysql-test ; MTR_BUILD_THREAD=auto \
		@PERL@ ./mysql-test-run.pl --force --comment=funcs1_ps --ps-protocol --suite=funcs_1
		@PERL@ ./mysql-test-run.pl --force --comment=funcs1_ps --ps-protocol --reorder --suite=funcs_1
		-cd mysql-test ; MTR_BUILD_THREAD=auto \
		@PERL@ ./mysql-test-run.pl --force --comment=funcs2 --suite=funcs_2
		-if [ -d mysql-test/suite/nist ] ; then \
		@@ -179,7 +179,7 @@ test-force-full-pl: test-force-full

		test-ext-funcs:
		cd mysql-test ; \
		@PERL@ ./mysql-test-run.pl --force --suite=funcs_1 ; \
		@PERL@ ./mysql-test-run.pl --force --reorder --suite=funcs_1 ; \
		@PERL@ ./mysql-test-run.pl --force --suite=funcs_2

		test-ext: test-ext-funcs

client/mysql.cc

+9 −33

Original line number	Diff line number	Diff line
		@@ -1779,7 +1779,7 @@ static int read_and_execute(bool interactive)
		the very beginning of a text file when
		you save the file using "Unicode UTF-8" format.
		*/
		if (!line_number &&
		if (line && !line_number &&
		(uchar) line[0] == 0xEF &&
		(uchar) line[1] == 0xBB &&
		(uchar) line[2] == 0xBF)
		@@ -2081,37 +2081,6 @@ static bool add_line(String &buffer,char line,char in_string,
		continue;
		}
		}
		else if (!ml_comment && !in_string &&
		(end_of_line - pos) >= 10 &&
		!my_strnncoll(charset_info, (uchar*) pos, 10,
		(const uchar*) "delimiter ", 10))
		{
		// Flush previously accepted characters
		if (out != line)
		{
		buffer.append(line, (uint32) (out - line));
		out= line;
		}

		// Flush possible comments in the buffer
		if (!buffer.is_empty())
		{
		if (com_go(&buffer, 0) > 0) // < 0 is not fatal
		DBUG_RETURN(1);
		buffer.length(0);
		}

		/*
		Delimiter wants the get rest of the given line as argument to
		allow one to change ';' to ';;' and back
		*/
		buffer.append(pos);
		if (com_delimiter(&buffer, pos) > 0)
		DBUG_RETURN(1);

		buffer.length(0);
		break;
		}
		else if (!ml_comment && !in_string && is_prefix(pos, delimiter))
		{
		// Found a statement. Continue parsing after the delimiter
		@@ -2156,7 +2125,14 @@ static bool add_line(String &buffer,char line,char in_string,
		}
		else if (!ml_comment && (!in_string && (inchar == '#' \|\|
		inchar == '-' && pos[1] == '-' &&
		my_isspace(charset_info,pos[2]))))
		/*
		The third byte is either whitespace or is the
		end of the line -- which would occur only
		because of the user sending newline -- which is
		itself whitespace and should also match.
		*/
		(my_isspace(charset_info,pos[2]) \|\|
		!pos[2]))))
		{
		// Flush previously accepted characters
		if (out != line)

configure.in

+2 −2

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
		AC_CANONICAL_SYSTEM
		# The Docs Makefile.am parses this line!
		# remember to also change ndb version below and update version.c in ndb
		AM_INIT_AUTOMAKE(mysql, 5.0.64)
		AM_INIT_AUTOMAKE(mysql, 5.0.66)
		AM_CONFIG_HEADER([include/config.h:config.h.in])

		PROTOCOL_VERSION=10
		@@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0
		# ndb version
		NDB_VERSION_MAJOR=5
		NDB_VERSION_MINOR=0
		NDB_VERSION_BUILD=64
		NDB_VERSION_BUILD=66
		NDB_VERSION_STATUS=""

		# Set all version vars based on $VERSION. How do we do this more elegant ?

mysql-test/Makefile.am

+2 −2

Original line number	Diff line number	Diff line
		@@ -67,7 +67,7 @@ dist-hook:
		$(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(distdir)/std_data
		$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50_data_be/BACKUP* $(distdir)/std_data/ndb_backup50_data_be
		$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50_data_le/BACKUP* $(distdir)/std_data/ndb_backup50_data_le
		$(INSTALL_DATA) $(srcdir)/std_data/funcs_1/* $(distdir)/std_data/funcs_1
		$(INSTALL_DATA) $(srcdir)/std_data/funcs_1/*.txt $(distdir)/std_data/funcs_1
		$(INSTALL_DATA) $(srcdir)/lib/*.pl $(distdir)/lib
		-rm -rf `find $(distdir)/suite -type d -name SCCS`

		@@ -106,7 +106,7 @@ install-data-local:
		$(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(DESTDIR)$(testdir)/std_data
		$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50_data_be/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup50_data_be
		$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50_data_le/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup50_data_le
		$(INSTALL_DATA) $(srcdir)/std_data/funcs_1/* $(DESTDIR)$(testdir)/std_data/funcs_1
		$(INSTALL_DATA) $(srcdir)/std_data/funcs_1/*.txt $(DESTDIR)$(testdir)/std_data/funcs_1
		$(INSTALL_DATA) $(srcdir)/lib/*.pl $(DESTDIR)$(testdir)/lib
		for f in `(cd $(srcdir); find suite -type f \| grep -v SCCS)`; \
		do \

mysql-test/include/wait_condition.inc

0 → 100644

+59 −0

Original line number	Diff line number	Diff line
		# include/wait_condition.inc
		#
		# SUMMARY
		#
		# Waits until the passed statement returns true, or the operation
		# times out.
		#
		# USAGE
		#
		# let $wait_condition=
		# SELECT c = 3 FROM t;
		# --source include/wait_condition.inc
		#
		# OR
		#
		# let $wait_timeout= 60; # Override default 30 seconds with 60.
		# let $wait_condition=
		# SELECT c = 3 FROM t;
		# --source include/wait_condition.inc
		# --echo Executed the test condition $wait_condition_reps times
		#
		# EXAMPLE
		# events_bugs.test, events_time_zone.test
		#

		--disable_query_log

		let $wait_counter= 300;
		if ($wait_timeout)
		{
		let $wait_counter= `SELECT $wait_timeout * 10`;
		}
		# Reset $wait_timeout so that its value won't be used on subsequent
		# calls, and default will be used instead.
		let $wait_timeout= 0;

		# Keep track of how many times the wait condition is tested
		# This is used by some tests (e.g., main.status)
		let $wait_condition_reps= 0;
		while ($wait_counter)
		{
		let $success= `$wait_condition`;
		inc $wait_condition_reps;
		if ($success)
		{
		let $wait_counter= 0;
		}
		if (!$success)
		{
		real_sleep 0.1;
		dec $wait_counter;
		}
		}
		if (!$success)
		{
		echo Timeout in wait_condition.inc for $wait_condition;
		}

		--enable_query_log