Merge bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam (9045798d) · Commits · Software / OSDI20 Artifacts / mariadb

Docs/Makefile.am

+16 −3

Original line number	Diff line number	Diff line
		@@ -19,11 +19,24 @@ EXTRA_DIST = mysql.info INSTALL-BINARY @extra_docs@
		# automake only seems to take care of this automatically,
		# if we're building the info page from texi directly.
		install-data-hook: $(srcdir)/mysql.info
		$(mkinstalldirs) $(DESTDIR)$(infodir)
		$(INSTALL_DATA) $(srcdir)/mysql.info $(DESTDIR)$(infodir)
		if test `basename $(prefix)` = "mysql" ; then \
		$(mkinstalldirs) $(DESTDIR)$(prefix)/docs ; \
		$(INSTALL_DATA) $(srcdir)/mysql.info $(DESTDIR)$(prefix)/docs ; \
		test ! -f $(top_srcdir)/ChangeLog \|\| $(INSTALL_DATA) $(top_srcdir)/ChangeLog $(DESTDIR)$(prefix)/docs ; \
		else \
		$(mkinstalldirs) $(DESTDIR)$(infodir) $(DESTDIR)$(pkgdatadir) ; \
		$(INSTALL_DATA) $(srcdir)/mysql.info $(DESTDIR)$(infodir) ; \
		test ! -f $(top_srcdir)/ChangeLog \|\| $(INSTALL_DATA) $(top_srcdir)/ChangeLog $(DESTDIR)$(pkgdatadir) ; \
		fi

		uninstall-local:
		@RM@ -f $(DESTDIR)$(infodir)/mysql.info
		if test `basename $(prefix)` = "mysql" ; then \
		@RM@ -f $(DESTDIR)$(prefix)/docs/mysql.info ; \
		@RM@ -f $(DESTDIR)$(prefix)/docs/ChangeLog ; \
		else \
		@RM@ -f $(DESTDIR)$(infodir)/mysql.info ; \
		@RM@ -f $(DESTDIR)$(pkgdatadir)/ChangeLog ; \
		fi

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

Makefile.am

+21 −21

Original line number	Diff line number	Diff line
		@@ -132,40 +132,40 @@ test-bt:
		-cd mysql-test ; MTR_BUILD_THREAD=auto \
		@PERL@ ./mysql-test-run.pl --comment=ps --force --timer \
		--skip-ndbcluster --ps-protocol
		-cd mysql-test ; MTR_BUILD_THREAD=auto \
		@PERL@ ./mysql-test-run.pl --comment=normal+rowrepl --force --timer \
		--skip-ndbcluster --mysqld=--binlog-format=row
		-cd mysql-test ; MTR_BUILD_THREAD=auto \
		@PERL@ ./mysql-test-run.pl --comment=ps+rowrepl+NDB --force --timer \
		--ps-protocol --mysqld=--binlog-format=row
		-cd mysql-test ; MTR_BUILD_THREAD=auto \
		@PERL@ ./mysql-test-run.pl --comment=NDB --force --timer \
		--with-ndbcluster-only
		-if [ -e bin/mysqltest_embedded -o -e libmysqld/examples/mysqltest_embedded ] ; then \
		cd mysql-test ; MTR_BUILD_THREAD=auto \
		@PERL@ ./mysql-test-run.pl --comment=embedded --force --timer \
		--embedded-server --skip-rpl --skip-ndbcluster ; \
		-if [ -e bin/ndbd -o -e storage/ndb/src/kernel/ndbd ] ; then \
		cd mysql-test ; \
		MTR_BUILD_THREAD=auto \
		@PERL@ ./mysql-test-run.pl --comment=ndb+rpl_ndb+ps --force --timer \
		--ps-protocol --mysqld=--binlog-format=row --suite=ndb,rpl_ndb ; \
		MTR_BUILD_THREAD=auto \
		@PERL@ ./mysql-test-run.pl --comment=ndb --force --timer \
		--with-ndbcluster-only ; \
		else \
		echo "no program found for 'embedded' tests - skipped testing" ; \
		echo "no program found for 'ndbcluster' tests - skipped testing" ; \
		fi
		-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 --suite=funcs_1
		-cd mysql-test ; MTR_BUILD_THREAD=auto \
		@PERL@ ./mysql-test-run.pl --force --comment=funcs2 --suite=funcs_2
		-cd mysql-test ; MTR_BUILD_THREAD=auto \
		@PERL@ ./mysql-test-run.pl --force --comment=rpl --suite=rpl
		-cd mysql-test ; MTR_BUILD_THREAD=auto \
		@PERL@ ./mysql-test-run.pl --force --comment=partitions --suite=parts
		-cd mysql-test ; MTR_BUILD_THREAD=auto \
		@PERL@ ./mysql-test-run.pl --force --comment=stress --suite=stress
		-if [ -d mysql-test/suite/nist ] ; then \
		cd mysql-test ; MTR_BUILD_THREAD=auto \
		@PERL@ ./mysql-test-run.pl --comment=NIST+normal --force --suite=nist ; \
		@PERL@ ./mysql-test-run.pl --comment=nist --force --suite=nist ; \
		fi
		-if [ -d mysql-test/suite/nist ] ; then \
		cd mysql-test ; MTR_BUILD_THREAD=auto \
		@PERL@ ./mysql-test-run.pl --comment=NIST+ps --force --suite=nist --ps-protocol ; \
		@PERL@ ./mysql-test-run.pl --comment=nist+ps --force --suite=nist --ps-protocol ; \
		fi
		-if [ -e bin/mysqltest_embedded -o -e libmysqld/examples/mysqltest_embedded ] ; then \
		cd mysql-test ; MTR_BUILD_THREAD=auto \
		@PERL@ ./mysql-test-run.pl --comment=embedded --force --timer \
		--embedded-server --skip-rpl --skip-ndbcluster ; \
		else \
		echo "no program found for 'embedded' tests - skipped testing" ; \
		fi
		-cd mysql-test ; MTR_BUILD_THREAD=auto \
		@PERL@ ./mysql-test-run.pl --force --comment=stress --suite=stress

		# Re-enable the "jp" suite when bug#28563 is fixed
		# -cd mysql-test ; MTR_BUILD_THREAD=auto \

libmysqld/CMakeLists.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -187,7 +187,7 @@ SET(LIBMYSQLD_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc
		../sql/strfunc.cc ../sql/table.cc ../sql/thr_malloc.cc
		../sql/time.cc ../sql/tztime.cc ../sql/uniques.cc ../sql/unireg.cc
		../sql/partition_info.cc ../sql/sql_connect.cc
		../sql/scheduler.cc
		../sql/scheduler.cc ../sql/stacktrace.c
		${GEN_SOURCES}
		${LIB_SOURCES})

libmysqld/lib_sql.cc

+3 −0

Original line number	Diff line number	Diff line
		@@ -1124,6 +1124,9 @@ bool Protocol::net_store_data(const uchar *from, size_t length)
		return FALSE;
		}

		#if defined(_MSC_VER) && _MSC_VER < 1400
		#define vsnprintf _vsnprintf
		#endif

		int vprint_msg_to_log(enum loglevel level __attribute__((unused)),
		const char *format, va_list argsi)

mysql-test/include/master-slave-reset.inc

+2 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@ connection slave;
		#(the server was started with skip-slave-start)
		--disable_warnings
		stop slave;
		--wait_for_slave_to_stop
		source include/wait_for_slave_to_stop.inc;
		--enable_warnings
		connection master;
		--disable_warnings
		@@ -20,3 +20,4 @@ reset slave;
		drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
		--enable_warnings
		start slave;
		source include/wait_for_slave_to_start.inc;