From ec92eca528a21caef2e5aded97ea4f5d567f2071 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 4 Jan 2005 08:15:33 +0100 Subject: [PATCH] mysql-test/Makefile.am Install varchar.frm Otherwise type_varchar fails when running mysql-test-run on installed system mysql-test/mysql-test-run.sh Use correct path to clist_tests in on installed system mysql-test/Makefile.am: Install varchar.frm Otherwise type_varchar fails when running mysql-test-run on installed system mysql-test/mysql-test-run.sh: Use correct path to clist_tests in on installed system --- mysql-test/Makefile.am | 3 ++- mysql-test/mysql-test-run.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index d718935cca8..3d5833c47be 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -52,7 +52,7 @@ dist-hook: $(INSTALL_DATA) $(srcdir)/std_data/*.dat $(srcdir)/std_data/*.000001 $(distdir)/std_data $(INSTALL_DATA) $(srcdir)/std_data/des_key_file $(distdir)/std_data $(INSTALL_DATA) $(srcdir)/std_data/*.pem $(distdir)/std_data - + $(INSTALL_DATA) $(srcdir)/std_data/*.frm $(distdir)/std_data install-data-local: $(mkinstalldirs) \ @@ -73,6 +73,7 @@ install-data-local: $(INSTALL_DATA) $(srcdir)/std_data/des_key_file $(DESTDIR)$(testdir)/std_data $(INSTALL_DATA) $(srcdir)/std_data/Moscow_leap $(DESTDIR)$(testdir)/std_data $(INSTALL_DATA) $(srcdir)/std_data/*.pem $(DESTDIR)$(testdir)/std_data + $(INSTALL_DATA) $(srcdir)/std_data/*.frm $(DESTDIR)$(testdir)/std_data std_data/%.pem: @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 80dcafff133..74189383aa7 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -537,7 +537,7 @@ else MYSQLD="$VALGRIND $BASEDIR/bin/mysqld" fi CLIENT_BINDIR="$BASEDIR/bin" - TESTS_BINDIR="$BASEDIR/tests" + TESTS_BINDIR="$BASEDIR/bin" MYSQL_TEST="$CLIENT_BINDIR/mysqltest" MYSQL_DUMP="$CLIENT_BINDIR/mysqldump" MYSQL_BINLOG="$CLIENT_BINDIR/mysqlbinlog"