Commit 4822079f authored by mleich@five.local.lan's avatar mleich@five.local.lan
Browse files

Merge five.local.lan:/work/merge/mysql-5.0-Bug 

into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
parents 282825af 89ddc0aa

mysql-test/Makefile.am

+6 −2
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ dist-hook: 
	mkdir -p $(distdir)/t $(distdir)/r $(distdir)/include \

		$(distdir)/std_data \

		$(distdir)/std_data/ndb_backup50_data_be $(distdir)/std_data/ndb_backup50_data_le \

		$(distdir)/lib

		$(distdir)/lib \

		$(distdir)/funcs_1

	-$(INSTALL_DATA) $(srcdir)/t/*.def $(distdir)/t

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

	-$(INSTALL_DATA) $(srcdir)/t/*.imtest $(distdir)/t
@@ -66,6 +67,7 @@ dist-hook: 
	$(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(distdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50_data_be/BACKUP* $(distdir)/std_data/ndb_backup50_data_be

	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50_data_le/BACKUP* $(distdir)/std_data/ndb_backup50_data_le

	$(INSTALL_DATA) $(srcdir)/std_data/funcs_1/* $(distdir)/std_data/funcs_1

	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(distdir)/lib

	-rm -rf `find $(distdir)/suite -type d -name SCCS`
@@ -77,7 +79,8 @@ install-data-local: 
		$(DESTDIR)$(testdir)/std_data \

		$(DESTDIR)$(testdir)/std_data/ndb_backup50_data_be \

		$(DESTDIR)$(testdir)/std_data/ndb_backup50_data_le \

		$(DESTDIR)$(testdir)/lib

		$(DESTDIR)$(testdir)/lib \

		$(DESTDIR)$(testdir)/funcs_1

	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir)

	-$(INSTALL_DATA) $(srcdir)/t/*.def $(DESTDIR)$(testdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.test $(DESTDIR)$(testdir)/t
@@ -103,6 +106,7 @@ install-data-local: 
	$(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50_data_be/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup50_data_be

	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50_data_le/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup50_data_le

	$(INSTALL_DATA) $(srcdir)/std_data/funcs_1/* $(distdir)/std_data/funcs_1

	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(DESTDIR)$(testdir)/lib

	for f in `(cd $(srcdir); find suite -type f | grep -v SCCS)`; \

	do \

mysql-test/mysql-test-run.pl

+2 −2
Original line number Diff line number Diff line
@@ -3739,9 +3739,9 @@ sub mysqld_arguments ($$$$) { 
  {

    # By default, prevent the started mysqld to access files outside of vardir

    my $secure_file_dir= $opt_vardir;

    if ( $opt_suite ne "main" )

    if ( $opt_suite ne "main" and $opt_suite ne "funcs_1" )

    {

      # When running a suite other than default allow the mysqld

      # When running a suite other than default or funcs_1 allow the mysqld

      # access to subdirs of mysql-test/ in order to make it possible

      # to "load data" from the suites data/ directory.

      $secure_file_dir= $glob_mysql_test_dir;