diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2020-05-16 00:19:00 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2020-05-18 18:11:58 +0200 |
| commit | 97b4686e2c2e3467d1271383387547dcbf629487 (patch) | |
| tree | a0bade44546089cd6a2781285d37978a386deab5 /mysql-test/main/mysql_install_db_win.result | |
| parent | e2bc0292115000102b7fcca5e2f59a0d0289d475 (diff) | |
| download | mariadb-git-97b4686e2c2e3467d1271383387547dcbf629487.tar.gz | |
MDEV-7021 allow config file parameter for mysql_install_db.exe
The new parameter is called --config
The config file is copied to the data directory as my.ini, and possibly
modified.
Bootstrap will now use my.ini to create tables. In case of non-standard
directory/file placements, this will ensure correct permissions for the
service user.
mysql_install_db_win test is extended to test --config with non-trivial
config file.
Diffstat (limited to 'mysql-test/main/mysql_install_db_win.result')
| -rw-r--r-- | mysql-test/main/mysql_install_db_win.result | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/mysql-test/main/mysql_install_db_win.result b/mysql-test/main/mysql_install_db_win.result index 950ff868035..6ee417f1a7d 100644 --- a/mysql-test/main/mysql_install_db_win.result +++ b/mysql-test/main/mysql_install_db_win.result @@ -1,8 +1,8 @@ Running bootstrap +Creating my.ini file Removing default user Allowing remote access for user root Setting root password -Creating my.ini file Creation of the database was successful # Kill the server # restart: --datadir=MYSQLTEST_VARDIR/tmp/ddir --loose-innodb @@ -12,4 +12,24 @@ SELECT @@datadir; DATADIR/ # Kill the server connection default; +[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=3307 +#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 + +[client] +port=3307 # restart |