10 files changed, 20 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 78d51abccec..d0d7a761107 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2041,7 +2041,7 @@ sub mysql_install_db {
   my $bootstrap_sql_file= "$opt_vardir/tmp/bootstrap.sql";
 
   # Use the mysql database for system tables
-  mtr_tofile($bootstrap_sql_file, "use mysql");
+  mtr_tofile($bootstrap_sql_file, "use mysql\n");
 
   # Add the offical mysql system tables
   # for a production system
@@ -2067,7 +2067,11 @@ sub mysql_install_db {
 
   # Remove anonymous users
   mtr_tofile($bootstrap_sql_file,
-	     "DELETE FROM mysql.user where user= '';");
+	     "DELETE FROM mysql.user where user= '';\n");
+
+  # Create mtr database
+  mtr_tofile($bootstrap_sql_file,
+	     "CREATE DATABASE mtr;\n");
 
   # Log bootstrap command
   my $path_bootstrap_log= "$opt_vardir/log/bootstrap.log";
diff --git a/mysql-test/r/1st.result b/mysql-test/r/1st.result
index 60190629dd0..4a82f8c66e9 100644
--- a/mysql-test/r/1st.result
+++ b/mysql-test/r/1st.result
@@ -1,6 +1,7 @@
 show databases;
 Database
 information_schema
+mtr
 mysql
 test
 show tables in mysql;
diff --git a/mysql-test/r/drop.result b/mysql-test/r/drop.result
index 71d6fcc7cd0..675c85d676e 100644
--- a/mysql-test/r/drop.result
+++ b/mysql-test/r/drop.result
@@ -47,6 +47,7 @@ create database mysqltest;
 show databases;
 Database
 information_schema
+mtr
 mysql
 mysqltest
 test
@@ -58,6 +59,7 @@ drop database mysqltest;
 show databases;
 Database
 information_schema
+mtr
 mysql
 test
 drop database mysqltest;
diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
index 18864148d29..faf3e0bb411 100644
--- a/mysql-test/r/information_schema.result
+++ b/mysql-test/r/information_schema.result
@@ -9,11 +9,13 @@ create user mysqltest_3@localhost;
 create user mysqltest_3;
 select * from information_schema.SCHEMATA where schema_name > 'm';
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+NULL	mtr	latin1	latin1_swedish_ci	NULL
 NULL	mysql	latin1	latin1_swedish_ci	NULL
 NULL	test	latin1	latin1_swedish_ci	NULL
 select schema_name from information_schema.schemata;
 schema_name
 information_schema
+mtr
 mysql
 test
 show databases like 't%';
@@ -22,6 +24,7 @@ test
 show databases;
 Database
 information_schema
+mtr
 mysql
 test
 show databases where `database` = 't%';
@@ -351,6 +354,7 @@ create view v0 (c) as select schema_name from information_schema.schemata;
 select * from v0;
 c
 information_schema
+mtr
 mysql
 test
 explain select * from v0;
diff --git a/mysql-test/r/ps_1general.result b/mysql-test/r/ps_1general.result
index 1c5f0e4dfd6..41307b62133 100644
--- a/mysql-test/r/ps_1general.result
+++ b/mysql-test/r/ps_1general.result
@@ -259,6 +259,7 @@ prepare stmt4 from ' show databases ';
 execute stmt4;
 Database
 information_schema
+mtr
 mysql
 test
 prepare stmt4 from ' show tables from test like ''t2%'' ';
diff --git a/mysql-test/r/schema.result b/mysql-test/r/schema.result
index 538abd8d039..564fb3626df 100644
--- a/mysql-test/r/schema.result
+++ b/mysql-test/r/schema.result
@@ -7,6 +7,7 @@ show schemas;
 Database
 information_schema
 foo
+mtr
 mysql
 test
 drop schema foo;
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index d1eb213670e..d1005de8173 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -140,6 +140,7 @@ Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is
 def			SCHEMATA	SCHEMA_NAME	Database	253	64	18	N	1	0	8
 Database
 information_schema
+mtr
 mysql
 test
 show databases like "test%";
diff --git a/mysql-test/suite/binlog/r/binlog_database.result b/mysql-test/suite/binlog/r/binlog_database.result
index 7deffb86244..c43d3bc6f57 100644
--- a/mysql-test/suite/binlog/r/binlog_database.result
+++ b/mysql-test/suite/binlog/r/binlog_database.result
@@ -52,5 +52,6 @@ master-bin.000001	#	Query	#	#	drop database testing_1
 show databases;
 Database
 information_schema
+mtr
 mysql
 test
diff --git a/mysql-test/suite/rpl/r/rpl_loaddata_m.result b/mysql-test/suite/rpl/r/rpl_loaddata_m.result
index 1d263a41e1b..a1294d515fa 100644
--- a/mysql-test/suite/rpl/r/rpl_loaddata_m.result
+++ b/mysql-test/suite/rpl/r/rpl_loaddata_m.result
@@ -21,6 +21,7 @@ COUNT(*)
 SHOW DATABASES;
 Database
 information_schema
+mtr
 mysql
 mysqltest
 test
diff --git a/mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result b/mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result
index f49c23248e5..bf668fb7ccc 100644
--- a/mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result
+++ b/mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result
@@ -9,6 +9,7 @@ CREATE DATABASE test_ignore;
 SHOW DATABASES;
 Database
 information_schema
+mtr
 mysql
 test
 test_ignore
@@ -33,6 +34,7 @@ master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 SHOW DATABASES;
 Database
 information_schema
+mtr
 mysql
 test
 USE test;