Commit 3e4fa505 authored by Sergei Golubchik's avatar Sergei Golubchik

die verbosely in main.mysql_install_db_win

parent ac56a6c1
...@@ -48,9 +48,9 @@ connection default; ...@@ -48,9 +48,9 @@ connection default;
# Test --template option # Test --template option
let _BASEDIR = $MYSQLTEST_VARDIR/tmp/basedir; let _BASEDIR = $MYSQLTEST_VARDIR/tmp/basedir;
perl; perl;
use autodie;
open(IN, '<', "std_data/mysql_install_db_win.ini.in") or die; open(IN, '<', "std_data/mysql_install_db_win.ini.in");
open(OUT, '>', "$ENV{MYSQLTEST_VARDIR}/tmp/mysql_install_db_win.ini") or die; open(OUT, '>', "$ENV{MYSQLTEST_VARDIR}/tmp/mysql_install_db_win.ini");
while (<IN>) { while (<IN>) {
s/BASEDIR/$ENV{_BASEDIR}/g; s/BASEDIR/$ENV{_BASEDIR}/g;
print OUT $_; print OUT $_;
...@@ -68,7 +68,8 @@ exec $MYSQL_INSTALL_DB_EXE -o --port=3307 --config=$MYSQLTEST_VARDIR/tmp/mysql_i ...@@ -68,7 +68,8 @@ exec $MYSQL_INSTALL_DB_EXE -o --port=3307 --config=$MYSQLTEST_VARDIR/tmp/mysql_i
# dump the modified config in data directory # dump the modified config in data directory
perl; perl;
open(IN, '<', "$ENV{_BASEDIR}/data/my.ini") or die; use autodie;
open(IN, '<', "$ENV{_BASEDIR}/data/my.ini");
while (<IN>) { while (<IN>) {
s/$ENV{_BASEDIR}/BASEDIR/g; s/$ENV{_BASEDIR}/BASEDIR/g;
# when testing on installation layout, client's plugin # when testing on installation layout, client's plugin
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment