Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint

1 files changed, 10 insertions, 4 deletions

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index d04998def8f..b1c042fdcde 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2919,16 +2919,21 @@ sub install_db ($$) {
   # ----------------------------------------------------------------------
   # Create the bootstrap.sql file
   # ----------------------------------------------------------------------
-  my $bootstrap_sql_file= "$opt_vardir/tmp/bootstrap.sql$$";
+  my $bootstrap_sql_file= "$opt_vardir/tmp/bootstrap.sql";
 
   # Use the mysql database for system tables
   mtr_tofile($bootstrap_sql_file, "use mysql");
 
-  # Add the offical mysql system tables and initial system data
-  # for a prodcuction system
+  # Add the offical mysql system tables
+  # for a production system
   mtr_appendfile_to_file("$path_sql_dir/mysql_system_tables.sql",
 			 $bootstrap_sql_file);
 
+  # Add the mysql system tables initial data
+  # for a production system
+  mtr_appendfile_to_file("$path_sql_dir/mysql_system_tables_data.sql",
+			 $bootstrap_sql_file);
+
   # Add test data for timezone - this is just a subset, on a real
   # system these tables will be populated either by mysql_tzinfo_to_sql
   # or by downloading the timezone table package from our website
@@ -2952,7 +2957,8 @@ sub install_db ($$) {
 
   {
     mtr_error("Error executing mysqld --bootstrap\n" .
-              "Could not install system database, see $path_bootstrap_log");
+              "Could not install system database from $bootstrap_sql_file\n" .
+	      "see $path_bootstrap_log for errors");
   }
 }