Skip to content

Commit 8023346

Browse files
committed
Bug#25510503 MTR SHOULD NOT SET CHARACTER SET OF TEST SCHEMA/DATABASE BY DEFAULT
1 parent 0997322 commit 8023346

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

mysql-test/mysql-test-run.pl

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ END
274274

275275
my $opt_record;
276276
my $opt_report_features;
277-
my $opt_charset_for_testdb= "latin1";
277+
my $opt_charset_for_testdb;
278278

279279
our $opt_resfile= $ENV{'MTR_RESULT_FILE'} || 0;
280280

@@ -4025,8 +4025,13 @@ sub mysql_install_db {
40254025
"DELETE FROM mysql.user where user= '';\n");
40264026

40274027
# Create test database
4028-
mtr_tofile($bootstrap_sql_file,
4029-
"CREATE DATABASE test CHARACTER SET $opt_charset_for_testdb;\n");
4028+
if (defined $opt_charset_for_testdb) {
4029+
mtr_tofile($bootstrap_sql_file,
4030+
"CREATE DATABASE test CHARACTER SET $opt_charset_for_testdb;\n");
4031+
} else {
4032+
mtr_tofile($bootstrap_sql_file,
4033+
"CREATE DATABASE test;\n");
4034+
}
40304035

40314036
# Create mtr database
40324037
mtr_tofile($bootstrap_sql_file,

0 commit comments

Comments
 (0)