diff options
Diffstat (limited to 'mysql-test/main/mysql_install_db_win.test')
| -rw-r--r-- | mysql-test/main/mysql_install_db_win.test | 37 |
1 files changed, 36 insertions, 1 deletions
diff --git a/mysql-test/main/mysql_install_db_win.test b/mysql-test/main/mysql_install_db_win.test index 3f0256e860e..ceb7293f611 100644 --- a/mysql-test/main/mysql_install_db_win.test +++ b/mysql-test/main/mysql_install_db_win.test @@ -9,7 +9,7 @@ exec $MYSQL_INSTALL_DB_EXE --datadir=$ddir --password=foo -R; let $restart_parameters=--datadir=$ddir --loose-innodb; --source include/start_mysqld.inc -connect root,localhost,root,foo; +connect (root,localhost,root,foo,mysql); # Smoke test - check that we're actually using datadir # we've created (i.e restart_parameters worked) --replace_result $ddir DATADIR @@ -44,5 +44,40 @@ rmdir $ddir; let $restart_parameters=; connection default; + +# Test --template option +let _BASEDIR = $MYSQLTEST_VARDIR/tmp/basedir; +perl; + use autodie; + open(IN, '<', "std_data/mysql_install_db_win.ini"); + open(OUT, '>', "$ENV{MYSQLTEST_VARDIR}/tmp/mysql_install_db_win.ini"); + while (<IN>) { + s/BASEDIR/$ENV{_BASEDIR}/g; + print OUT $_; + } + close IN; + close OUT +EOF +mkdir $_BASEDIR; +mkdir $_BASEDIR/temp; + +# Run mysql_install_db.exe with config parameter +--disable_result_log +exec $MYSQL_INSTALL_DB_EXE -o --port=3307 --config=$MYSQLTEST_VARDIR/tmp/mysql_install_db_win.ini; +--enable_result_log + +# dump the modified config in data directory +perl; + use autodie; + open(IN, '<', "$ENV{_BASEDIR}/data/my.ini"); + while (<IN>) { + s/$ENV{_BASEDIR}/BASEDIR/g; + # when testing on installation layout, client's plugin + # dir is added, but when testing in build dir. + print unless $_ =~ /plugin-dir/; + } + close IN; +EOF +rmdir $_BASEDIR; --source include/start_mysqld.inc |