diff options
| author | unknown <Kristofer.Pettersson@naruto.> | 2006-12-11 14:22:56 +0100 |
|---|---|---|
| committer | unknown <Kristofer.Pettersson@naruto.> | 2006-12-11 14:22:56 +0100 |
| commit | a9b7f5e61e94244db558052cc680e20ff41b25f7 (patch) | |
| tree | 3a4d5d52c9542b90a4be157eebc90e0d195cb59e | |
| parent | 9d3eadeab9a0308cca45a720ffe6f59b74d5abaf (diff) | |
| parent | a63a66cb46d16088fd9c634c2b0ebca0471e78ad (diff) | |
| download | mariadb-git-a9b7f5e61e94244db558052cc680e20ff41b25f7.tar.gz | |
Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint
into naruto.:C:/cpp/mysql-5.0-maint
| -rw-r--r-- | mysql-test/Makefile.am | 2 | ||||
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 341afac1c9a..eff2ae740f5 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -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 diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index c2d8f8ae2f8..ffc27ecabdb 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -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); |