Commit 45b904e2 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/mysql-5.0 

into mysql.com:/home/jonas/src/mysql-5.0-ndb
parents 40823e8a ec92eca5

mysql-test/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -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

mysql-test/mysql-test-run.sh

+1 −1
Original line number Diff line number Diff line
@@ -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"