Commit 29e300d1 authored by monty@donna.mysql.fi's avatar monty@donna.mysql.fi
Browse files

Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql

parents 566f8236 16988cae

Docs/manual.texi

+2 −0
Original line number Diff line number Diff line
@@ -43953,6 +43953,8 @@ when to_table was empty. 
@appendixsubsec Changes in release 3.23.37

@itemize @bullet

@item

Fixed a bug when using MATCH in HAVING clause.

@item

Fixed a bug when using @code{HEAP} tables with @code{LIKE}.

@item

Added @code{--mysql-version} to @code{safe_mysqld}

mysql-test/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ CLEANFILES = $(test_SCRIPTS) 
dist-hook:

	mkdir -p $(distdir)/t $(distdir)/r $(distdir)/include \

		$(distdir)/std_data

	$(INSTALL_DATA) $(srcdir)/t/*.test $(srcdir)/t/*.opt $(distdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.test $(srcdir)/t/*.opt $(srcdir)/t/*.sh $(distdir)/t

	$(INSTALL_DATA) $(srcdir)/include/*.inc $(distdir)/include

	$(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.require $(distdir)/r

	$(INSTALL_DATA) $(srcdir)/std_data/*.dat $(distdir)/std_data

scripts/make_binary_distribution.sh

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ $CP mysql-test/mysql-test-run mysql-test/install_test_db $BASE/mysql-test/ 
$CP mysql-test/README $BASE/mysql-test/README

$CP mysql-test/include/*.inc $BASE/mysql-test/include

$CP mysql-test/std_data/*.dat $BASE/mysql-test/std_data

$CP mysql-test/t/*.test mysql-test/t/*.opt $BASE/mysql-test/t

$CP mysql-test/t/*.test mysql-test/t/*.opt mysql-test/t/*.sh $BASE/mysql-test/t

$CP mysql-test/r/*.result mysql-test/r/*.require $BASE/mysql-test/r



$CP scripts/* $BASE/bin