summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.fi>2001-04-19 14:44:05 +0300
committerunknown <monty@donna.mysql.fi>2001-04-19 14:44:05 +0300
commitecc53c17380f1e8cd2712c04fc8e8da3c91b7f9b (patch)
treea4054d29f9276634506be0608940676103239462
parentefa4fdf044fe175b6e777ae1cdea0aa716b14945 (diff)
parentb0d400403845e99f721fb5b6ea28a417b9dce0e6 (diff)
downloadmariadb-git-ecc53c17380f1e8cd2712c04fc8e8da3c91b7f9b.tar.gz
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
Docs/manual.texi: Auto merged
-rw-r--r--Docs/manual.texi2
-rw-r--r--mysql-test/Makefile.am2
-rw-r--r--scripts/make_binary_distribution.sh2
3 files changed, 4 insertions, 2 deletions
diff --git a/Docs/manual.texi b/Docs/manual.texi
index eac0045e489..7f55a3b7e78 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -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}
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
index 6deb69b49df..1f116a6e313 100644
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -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
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index 030d8b5c0d6..7dc5c90ea25 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -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