mysql8.4/mysql-install-test.patch

mysql's idea of a suitable place to install the regression tests is
/usr/mysql-test.  To relocate this to a reasonably FHS-compliant place
like /usr/share/mysql-test, we have to hack up the paths in install_test_db
and mysql-test-run.  This patch also improves the documentation a tad.


diff -Naur mysql-5.0.21.orig/mysql-test/README mysql-5.0.21/mysql-test/README
--- mysql-5.0.21.orig/mysql-test/README	2006-04-26 14:31:03.000000000 -0400
+++ mysql-5.0.21/mysql-test/README	2006-05-01 20:58:04.000000000 -0400
@@ -6,6 +6,14 @@
 actually have a co-existing MySQL installation. The tests will not
 conflict with it.
 
+For use in Red Hat distributions, you should run the script as user mysql,
+so the best bet is something like
+	cd /usr/share/mysql-test
+	sudo -u mysql ./mysql-test-run
+This will use the installed mysql executables, but will run a private copy
+of the server process (using data files within /usr/share/mysql-test),
+so you need not start the mysqld service beforehand.
+
 All tests must pass. If one or more of them fail on your system, please
 read the following manual section for instructions on how to report the
 problem:
@@ -25,7 +33,8 @@
 
 With no test cases named on the command line, mysql-test-run falls back
 to the normal "non-extern" behavior. The reason for this is that some
-tests cannot run with an external server.
+tests cannot run with an external server (because they need to control the
+options with which the server is started).
 
 
 You can create your own test cases. To create a test case, create a new
diff -Naur mysql-5.0.21.orig/mysql-test/install_test_db.sh mysql-5.0.21/mysql-test/install_test_db.sh
--- mysql-5.0.21.orig/mysql-test/install_test_db.sh	2006-04-26 14:31:03.000000000 -0400
+++ mysql-5.0.21/mysql-test/install_test_db.sh	2006-05-01 20:56:05.000000000 -0400
@@ -9,17 +9,17 @@
   shift 1
 
   # Check if it's a binary distribution or a 'make install'
-  if test -x ../libexec/mysqld
+  if test -x /usr/libexec/mysqld
   then
-    execdir=../libexec
+    execdir=/usr/libexec
   else
-    execdir=../bin
+    execdir=/usr/bin
   fi
-  bindir=../bin
+  bindir=/usr/bin
   BINARY_DIST=1
   fix_bin=mysql-test
-  scriptdir=../bin
-  libexecdir=../libexec
+  scriptdir=/usr/bin
+  libexecdir=/usr/libexec
 else
   execdir=../sql
   bindir=../client
@@ -75,7 +75,8 @@
 
 #for error messages
 if [ x$BINARY_DIST = x1 ] ; then
-basedir=..
+basedir=/usr/share
+EXTRA_ARG="--language=/usr/share/mysql/english/ --character-sets-dir=/usr/share/mysql/charsets/"
 else
 basedir=.
 EXTRA_ARG="--language=../sql/share/english/ --character-sets-dir=../sql/share/charsets/"
diff -Naur mysql-5.0.21.orig/mysql-test/mysql-test-run.sh mysql-5.0.21/mysql-test/mysql-test-run.sh
--- mysql-5.0.21.orig/mysql-test/mysql-test-run.sh	2006-04-26 14:31:05.000000000 -0400
+++ mysql-5.0.21/mysql-test/mysql-test-run.sh	2006-05-01 20:56:05.000000000 -0400
@@ -740,6 +740,8 @@
  # currently all binaries are in "bin", for a MySQL AB packaging
  # some are in "tests".
 
+ BASEDIR="/usr"
+
  if test -x "$BASEDIR/libexec/mysqld"
  then
    MYSQLD="$VALGRIND $BASEDIR/libexec/mysqld"