Commit a9b7f5e6 authored by unknown's avatar unknown
Browse files

Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint 

into  naruto.:C:/cpp/mysql-5.0-maint
parents 9d3eadea a63a66cb

mysql-test/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ install-data-local: 
	$(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

	$(INSTALL_DATA) $(srcdir)/std_data/*.MY* $(DESTDIR)$(distdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.MY* $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/lib/init_db.sql $(DESTDIR)$(testdir)/lib

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

mysql-test/mysql-test-run.pl

+2 −3
Original line number Diff line number Diff line
@@ -3527,11 +3527,10 @@ sub mysqld_arguments ($$$$$) { 
  if ( $glob_use_embedded_server )

  {

    $prefix= "--server-arg=";

  } else {

    # We can't pass embedded server --no-defaults

    mtr_add_arg($args, "--no-defaults");

  }



  mtr_add_arg($args, "%s--no-defaults", $prefix);



  mtr_add_arg($args, "%s--console", $prefix);

  mtr_add_arg($args, "%s--basedir=%s", $prefix, $path_my_basedir);

  mtr_add_arg($args, "%s--character-sets-dir=%s", $prefix, $path_charsetsdir);