From 3b052f8187aa36df1c2518a27d95381867eceffb Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 15 Jul 2021 09:39:44 +0200 Subject: don't use *.in for test data because INSTALL_MYSQL_TEST() cmake macro has PATTERN "*.in" EXCLUDE --- mysql-test/main/mysql_install_db_win.test | 2 +- mysql-test/std_data/mysql_install_db_win.ini | 18 ++++++++++++++++++ mysql-test/std_data/mysql_install_db_win.ini.in | 18 ------------------ 3 files changed, 19 insertions(+), 19 deletions(-) create mode 100644 mysql-test/std_data/mysql_install_db_win.ini delete mode 100644 mysql-test/std_data/mysql_install_db_win.ini.in diff --git a/mysql-test/main/mysql_install_db_win.test b/mysql-test/main/mysql_install_db_win.test index 5a478922a1e..ceb7293f611 100644 --- a/mysql-test/main/mysql_install_db_win.test +++ b/mysql-test/main/mysql_install_db_win.test @@ -49,7 +49,7 @@ connection default; let _BASEDIR = $MYSQLTEST_VARDIR/tmp/basedir; perl; use autodie; - open(IN, '<', "std_data/mysql_install_db_win.ini.in"); + open(IN, '<', "std_data/mysql_install_db_win.ini"); open(OUT, '>', "$ENV{MYSQLTEST_VARDIR}/tmp/mysql_install_db_win.ini"); while () { s/BASEDIR/$ENV{_BASEDIR}/g; diff --git a/mysql-test/std_data/mysql_install_db_win.ini b/mysql-test/std_data/mysql_install_db_win.ini new file mode 100644 index 00000000000..e9b5e7a84b0 --- /dev/null +++ b/mysql-test/std_data/mysql_install_db_win.ini @@ -0,0 +1,18 @@ +[mysqld] +long_query_time=15.000000 +#slow_query_log_file=l:/errorlog/mariadb.slow.log +slow_query_log_file=BASEDIR/data/slow_query_log_01.log +datadir=BASEDIR/data/ +server-id=1 +port=3306 +#tmpdir=C:/mysql_tmpdir +tmpdir=BASEDIR/temp +innodb_data_file_path=ibdata1:10M;ibdata2:10M:autoextend +innodb_log_group_home_dir=BASEDIR/data +skip-name-resolve + +#********************************************************* +# performance_schema +#********************************************************* +performance_schema=OFF + diff --git a/mysql-test/std_data/mysql_install_db_win.ini.in b/mysql-test/std_data/mysql_install_db_win.ini.in deleted file mode 100644 index e9b5e7a84b0..00000000000 --- a/mysql-test/std_data/mysql_install_db_win.ini.in +++ /dev/null @@ -1,18 +0,0 @@ -[mysqld] -long_query_time=15.000000 -#slow_query_log_file=l:/errorlog/mariadb.slow.log -slow_query_log_file=BASEDIR/data/slow_query_log_01.log -datadir=BASEDIR/data/ -server-id=1 -port=3306 -#tmpdir=C:/mysql_tmpdir -tmpdir=BASEDIR/temp -innodb_data_file_path=ibdata1:10M;ibdata2:10M:autoextend -innodb_log_group_home_dir=BASEDIR/data -skip-name-resolve - -#********************************************************* -# performance_schema -#********************************************************* -performance_schema=OFF - -- cgit v1.2.1