mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
MDEV-12645 - mysql_install_db: no install test db option
Added --skip-test-db option to mysql_install_db. If specified, no test database created and relevant grants issued. Removed --skip-auth-anonymous-user option of mysql_install_db. Now it is covered by --skip-test-db. Dropped some Debian patches that did the same. Removed unused make_win_bin_dist.1, make_win_bin_dist and mysql_install_db.pl.in.
This commit is contained in:
@ -3191,9 +3191,6 @@ sub mysql_install_db {
|
||||
mtr_appendfile_to_file("$sql_dir/mysql_performance_tables.sql",
|
||||
$bootstrap_sql_file);
|
||||
|
||||
# Don't install anonymous users
|
||||
mtr_tofile($bootstrap_sql_file, "set \@skip_auth_anonymous=1;\n");
|
||||
|
||||
# Add the mysql system tables initial data
|
||||
# for a production system
|
||||
mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql",
|
||||
@ -3211,6 +3208,10 @@ sub mysql_install_db {
|
||||
mtr_appendfile_to_file("$sql_dir/fill_help_tables.sql",
|
||||
$bootstrap_sql_file);
|
||||
|
||||
# Create test database
|
||||
mtr_appendfile_to_file("$sql_dir/mysql_test_db.sql",
|
||||
$bootstrap_sql_file);
|
||||
|
||||
# mysql.gtid_slave_pos was created in InnoDB, but many tests
|
||||
# run without InnoDB. Alter it to MyISAM now
|
||||
mtr_tofile($bootstrap_sql_file, "ALTER TABLE gtid_slave_pos ENGINE=MyISAM;\n");
|
||||
@ -3228,6 +3229,10 @@ sub mysql_install_db {
|
||||
sql_to_bootstrap($text));
|
||||
}
|
||||
|
||||
# Remove anonymous users
|
||||
mtr_tofile($bootstrap_sql_file,
|
||||
"DELETE FROM mysql.user where user= '';\n");
|
||||
|
||||
# Create mtr database
|
||||
mtr_tofile($bootstrap_sql_file,
|
||||
"CREATE DATABASE mtr CHARSET=latin1;\n");
|
||||
@ -3248,7 +3253,6 @@ sub mysql_install_db {
|
||||
|
||||
# Create directories mysql and test
|
||||
mkpath("$install_datadir/mysql");
|
||||
mkpath("$install_datadir/test");
|
||||
|
||||
if ( My::SafeProcess->run
|
||||
(
|
||||
|
Reference in New Issue
Block a user