Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 (84c4f5af) · Commits · Software / OSDI20 Artifacts / mariadb

Makefile.am

+24 −19

Original line number	Diff line number	Diff line
		@@ -101,7 +101,9 @@ dist-hook:

		tags:
		support-files/build-tags
		.PHONY: init-db bin-dist

		.PHONY: init-db bin-dist test test-full test-ps test-nr \
		test-ns test-pr test-unit

		# Target 'test' will run the regression test suite using the built server.
		#
		@@ -111,29 +113,34 @@ tags:
		# will then calculate the various port numbers it needs from this,
		# making sure each user use different ports.

		test:
		test-unit:
		cd unittest && $(MAKE) test

		test-ps:
		cd mysql-test ; \
		./mysql-test-run.pl --mysqld=--binlog-format=statement && \
		./mysql-test-run.pl --ps-protocol --mysqld=--binlog-format=row
		./mysql-test-run.pl $(force) --ps-protocol --mysqld=--binlog-format=statement

		test-full:
		test-nr:
		cd mysql-test ; \
		./mysql-test-run.pl --mysqld=--binlog-format=statement && \
		./mysql-test-run.pl --ps-protocol --mysqld=--binlog-format=statement && \
		./mysql-test-run.pl --mysqld=--binlog-format=row && \
		./mysql-test-run.pl --ps-protocol --mysqld=--binlog-format=row
		./mysql-test-run.pl $(force) --mysqld=--binlog-format=row

		test-force:
		test-pr:
		cd mysql-test ; \
		./mysql-test-run.pl --force --mysqld=--binlog-format=statement && \
		./mysql-test-run.pl --ps-protocol --force --mysqld=--binlog-format=row
		./mysql-test-run.pl $(force) --ps-protocol --mysqld=--binlog-format=row

		test-force-full:
		test-ns:
		cd mysql-test ; \
		./mysql-test-run.pl --force --mysqld=--binlog-format=statement && \
		./mysql-test-run.pl --force --ps-protocol --mysqld=--binlog-format=statement && \
		./mysql-test-run.pl --force --mysqld=--binlog-format=row && \
		./mysql-test-run.pl --force --ps-protocol --mysqld=--binlog-format=row
		./mysql-test-run.pl $(force) --mysqld=--binlog-format=statement

		test: test-unit test-ns test-pr

		test-full: test test-nr test-ps

		test-force:
		$(MAKE) force=--force test

		test-force-full:
		$(MAKE) force=--force test-full

		# Keep these for a while
		test-pl: test
		@@ -141,8 +148,6 @@ test-full-pl: test-full
		test-force-pl: test-force
		test-force-full-pl: test-force-full



		# Don't update the files from bitkeeper
		%::SCCS/s.%

config/ac-macros/plugins.m4

+1 −1

Original line number	Diff line number	Diff line
		@@ -406,7 +406,7 @@ dnl Although this is "pretty", it breaks libmysqld build
		mysql_plugin_dirs="$mysql_plugin_dirs $6"
		m4_syscmd(test -f "$6/configure")
		ifelse(m4_sysval, 0,
		[other_configures="$other_configures $6/configure"],
		[AC_CONFIG_SUBDIRS($6)],
		[AC_CONFIG_FILES($6/Makefile)]
		)
		ifelse(m4_substr($6, 0, 8), [storage/],

configure.in

+7 −22

Original line number	Diff line number	Diff line
		@@ -2474,10 +2474,6 @@ AC_SUBST(netware_dir)
		AC_SUBST(linked_netware_sources)
		AM_CONDITIONAL(HAVE_NETWARE, test "$netware_dir" = "netware")

		# Ensure that table handlers gets all modifications to CFLAGS/CXXFLAGS
		export CC CXX CFLAGS CXXFLAGS LD LDFLAGS AR
		ac_configure_args="$ac_configure_args CFLAGS='$CFLAGS' CXXFLAGS='$CXXFLAGS'"

		if test "$with_server" = "yes" -o "$THREAD_SAFE_CLIENT" != "no"
		then
		AC_DEFINE([THREAD], [1],
		@@ -2527,22 +2523,6 @@ AC_SUBST(CC)
		AC_SUBST(GXX)

		# Set configuration options for make_binary_distribution

		CONF_ARGS=
		case $SYSTEM_TYPE in
		netware)
		MAKE_BINARY_DISTRIBUTION_OPTIONS=--no-strip
		CONF_ARGS=--host="$MACHINE_TYPE-$SYSTEM_TYPE"
		;;
		*)
		MAKE_BINARY_DISTRIBUTION_OPTIONS=
		;;
		esac

		for CONF in $other_configures; do
		(cd `dirname $CONF`; ./`basename $CONF` $CONF_ARGS --build=$build_alias)
		done

		AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS)

		# Output results
		@@ -2559,7 +2539,12 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
		support-files/MacOSX/Makefile mysql-test/Makefile dnl
		mysql-test/ndb/Makefile netware/Makefile dnl
		include/mysql_version.h plugin/Makefile win/Makefile)

		AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" \|\| echo timestamp > stamp-h)

		# Ensure that table handlers gets all modifications to CFLAGS/CXXFLAGS
		AC_CONFIG_COMMANDS_POST(ac_configure_args="$ac_configure_args CFLAGS='$CFLAGS' CXXFLAGS='$CXXFLAGS'")

		AC_OUTPUT

		echo

dbug/dbug.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1728,7 +1728,7 @@ static void DoPrefix(CODE_STATE *cs, uint _line_)
		struct tm *tm_p;
		if (gettimeofday(&tv, NULL) != -1)
		{
		if ((tm_p= localtime(&tv.tv_sec)))
		if ((tm_p= localtime((const time_t *)&tv.tv_sec)))
		{
		(void) fprintf (cs->stack->out_file,
		/* "%04d-%02d-%02d " */

extra/yassl/src/handshake.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -880,7 +880,7 @@ int sendData(SSL& ssl, const void* buffer, int sz)
		ssl.SetError(no_error);

		ssl.verfiyHandShakeComplete();
		if (ssl.GetError()) return 0;
		if (ssl.GetError()) return -1;
		int sent = 0;

		for (;;) {
		@@ -891,7 +891,7 @@ int sendData(SSL& ssl, const void* buffer, int sz)
		buildMessage(ssl, out, data);
		ssl.Send(out.get_buffer(), out.get_size());

		if (ssl.GetError()) return 0;
		if (ssl.GetError()) return -1;
		sent += len;
		if (sent == sz) break;
		}
		@@ -918,14 +918,14 @@ int receiveData(SSL& ssl, Data& data)
		ssl.SetError(no_error);

		ssl.verfiyHandShakeComplete();
		if (ssl.GetError()) return 0;
		if (ssl.GetError()) return -1;

		if (!ssl.bufferedData())
		processReply(ssl);
		ssl.fillData(data);
		ssl.useLog().ShowData(data.get_length());

		if (ssl.GetError()) return 0;
		if (ssl.GetError()) return -1;

		if (data.get_length() == 0 && ssl.getSocket().WouldBlock()) {
		ssl.SetError(YasslError(SSL_ERROR_WANT_READ));