diff options
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 85b9089714f..703c5030810 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -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 ( |