Merge neptunus.(none):/home/msvensson/mysql/bug20589/my50-bug20589 (fc9a6bc5) · Commits · Software / OSDI20 Artifacts / mariadb

.bzrignore

+4 −0

Original line number	Diff line number	Diff line
		@@ -334,6 +334,7 @@ client/sql_string.cpp
		client/ssl_test
		client/thimble
		client/thread_test
		client/tmp.diff
		client_debug/*
		client_release/*
		client_test
		@@ -697,6 +698,7 @@ mysql-test/r/*.err
		mysql-test/r/*.log
		mysql-test/r/*.out
		mysql-test/r/*.reject
		mysql-test/r/*.warnings
		mysql-test/r/alter_table.err
		mysql-test/r/archive.err
		mysql-test/r/bdb-alter-table-1.err
		@@ -762,10 +764,12 @@ mysql-test/r/rpl000016.eval
		mysql-test/r/rpl_log.eval
		mysql-test/r/slave-running.eval
		mysql-test/r/slave-stopped.eval
		mysql-test/r/tmp.result
		mysql-test/r/udf.log
		mysql-test/share/mysql
		mysql-test/std_data/*.pem
		mysql-test/t/index_merge.load
		mysql-test/t/tmp.test
		mysql-test/var
		mysql-test/var/*
		mysql.kdevprj

BUILD/SETUP.sh

+3 −3

Original line number	Diff line number	Diff line
		@@ -56,9 +56,9 @@ global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wch
		#debug_extra_warnings="-Wuninitialized"
		c_warnings="$global_warnings -Wunused"
		cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"
		base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine $SSL_LIBRARY"
		base_max_no_ndb_configs="--with-innodb --with-berkeley-db --without-ndbcluster --with-archive-storage-engine --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine $SSL_LIBRARY"
		max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-csv-storage-engine $SSL_LIBRARY --with-embedded-server --with-big-tables"
		base_max_configs="--with-innodb --with-ndbcluster --with-archive-storage-engine --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine $SSL_LIBRARY"
		base_max_no_ndb_configs="--with-innodb --without-ndbcluster --with-archive-storage-engine --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine $SSL_LIBRARY"
		max_leave_isam_configs="--with-innodb --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-csv-storage-engine $SSL_LIBRARY --with-embedded-server --with-big-tables"
		max_configs="$base_max_configs --with-embedded-server"
		max_no_ndb_configs="$base_max_no_ndb_configs --with-embedded-server"

BitKeeper/etc/collapsed

+2 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,8 @@
		45214442pBGT9KuZEGixBH71jTzbOA
		45214a07hVsIGwvwa-WrO-jpeaSwVw
		452a92d0-31-8wSzSfZi165fcGcXPA
		452c6c6dAjuNghfc1ObZ_UQ5SCl85g
		4538a7b0EbDHHkWPbIwxO6ZIDdg6Dg
		454a7ef8gdvE_ddMlJyghvOAkKPNOQ
		454bb488ijVLOUK_GFjcoISE0GxPUA
		454bb9a8AwlGRC_wWLS2sNMoRBMRGw

BitKeeper/triggers/post-commit

+11 −3

Original line number	Diff line number	Diff line
		@@ -35,9 +35,17 @@ fi

		CHANGESET=`bk -R prs -r+ -h -d':P:::I:' ChangeSet`
		CSETKEY=`bk -R prs -r+ -h -d':KEY:' ChangeSet`
		BUG=`bk -R prs -r+ -h -d':C:' ChangeSet \| sed -ne 's/^.[Bb][Uu][Gg] # $[0-9][0-9]$.*$/\1/p'`
		WL=`bk -R prs -r+ -h -d':C:' ChangeSet \| sed -ne 's/^.[Ww][Ll] # $[0-9][0-9]$.*$/ WL#\1/p'`

		#
		# composing subject lines of commit mails.
		# if a fix targets to a WL and there is a bug referred
		# then X-Bug mail header will contain the first found bug's number
		#
		BUG=`bk -R prs -r+ -h -d':C:' ChangeSet \| \
		sed -ne 's/[Bb][Uu][Gg] # $[0-9][0-9]$.$/BUG#\1/
		s/.BUG#$[0-9][0-9]$/\1/p'`
		WL=`bk -R prs -r+ -h -d':C:' ChangeSet \| \
		sed -ne 's/[Ww][Ll] # $[0-9][0-9]$.$/WL#\1/
		s/.$WL#[0-9][0-9]$/ \1/p'`
		if [ "$BUG" = "" ]
		then
		TO=dev-public@mysql.com

Docs/Makefile.am

+11 −11

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ all-local: $(TXT_FILES)
		# make sure that "make install" installs the info page, too
		# automake only seems to take care of this automatically,
		# if we're building the info page from texi directly.
		install-data-hook: mysql.info
		install-data-hook: $(srcdir)/mysql.info
		$(mkinstalldirs) $(DESTDIR)$(infodir)
		$(INSTALL_DATA) $(srcdir)/mysql.info $(DESTDIR)$(infodir)

		@@ -44,23 +44,23 @@ CLEAN_FILES: $(TXT_FILES)

		GT = $(srcdir)/Support/generate-text-files.pl

		../INSTALL-SOURCE: mysql.info $(GT)
		perl -w $(GT) mysql.info "installing-source" "windows-source-build" > $@
		../INSTALL-SOURCE: $(srcdir)/mysql.info $(GT)
		perl -w $(GT) $(srcdir)/mysql.info "installing-source" "windows-source-build" > $@

		../INSTALL-WIN-SOURCE: mysql.info $(GT)
		perl -w $(GT) mysql.info "windows-source-build" "post-installation" > $@
		../INSTALL-WIN-SOURCE: $(srcdir)/mysql.info $(GT)
		perl -w $(GT) $(srcdir)/mysql.info "windows-source-build" "post-installation" > $@

		# We put the description for the binary installation here so that
		# people who download source wont have to see it. It is moved up to
		# the toplevel by the script that makes the binary tar files.
		INSTALL-BINARY: mysql.info $(GT)
		perl -w $(GT) mysql.info "installing-binary" "installing-source" > $@
		INSTALL-BINARY: $(srcdir)/mysql.info $(GT)
		perl -w $(GT) $(srcdir)/mysql.info "installing-binary" "installing-source" > $@

		../EXCEPTIONS-CLIENT: mysql.info $(GT)
		perl -w $(GT) mysql.info "mysql-floss-license-exception" "function-index" > $@
		../EXCEPTIONS-CLIENT: $(srcdir)/mysql.info $(GT)
		perl -w $(GT) $(srcdir)/mysql.info "mysql-floss-license-exception" "function-index" > $@

		../support-files/MacOSX/ReadMe.txt: mysql.info $(GT)
		perl -w $(GT) mysql.info "mac-os-x-installation" "netware-installation" > $@
		../support-files/MacOSX/ReadMe.txt: $(srcdir)/mysql.info $(GT)
		perl -w $(GT) $(srcdir)/mysql.info "mac-os-x-installation" "netware-installation" > $@

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