bzr commit into mysql-6.0 branch (sven:2677) Bug#33337 Bug#39011

[Sven Sandberg]

#At file:///home/sven/bzr/merge/6.0_from_6.0-rpl_FROM_6.0-rpl/

 2677 Sven Sandberg	2008-08-27 [merge]
      merge of 6.0-rpl into (local merge of 6.0-rpl into 6.0)
      all changes automerged, no conflicts
modified:
  client/mysqltest.cc
  mysql-test/mysql-test-run.pl
  sql/sql_class.h

=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2008-08-27 12:49:58 +0000
+++ b/client/mysqltest.cc	2008-08-27 13:42:29 +0000
@@ -3329,6 +3329,14 @@ void do_diff_files(struct st_command *co
                      sizeof(diff_file_args)/sizeof(struct command_arg),
                      ' ');
 
+  if (access(ds_filename.str, F_OK) != 0)
+    die("command \"diff_files\" failed, file '%s' does not exist",
+        ds_filename.str);
+
+  if (access(ds_filename2.str, F_OK) != 0)
+    die("command \"diff_files\" failed, file '%s' does not exist",
+        ds_filename2.str);
+
   if ((error= compare_files(ds_filename.str, ds_filename2.str)))
   {
     /* Compare of the two files failed, append them to output

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2008-08-27 12:49:58 +0000
+++ b/mysql-test/mysql-test-run.pl	2008-08-27 13:42:29 +0000
@@ -1059,6 +1059,28 @@ sub command_line_setup {
       mtr_error("Can't use --extern with --embedded-server");
     }
 
+
+    if ($opt_gdb)
+    {
+      mtr_warning("Silently converting --gdb to --client-gdb in embedded mode");
+      $opt_client_gdb= $opt_gdb;
+      $opt_gdb= undef;
+    }
+
+    if ($opt_ddd)
+    {
+      mtr_warning("Silently converting --ddd to --client-ddd in embedded mode");
+      $opt_client_ddd= $opt_ddd;
+      $opt_ddd= undef;
+    }
+
+    if ($opt_debugger)
+    {
+      mtr_warning("Silently converting --debugger to --client-debugger in embedded
mode");
+      $opt_client_debugger= $opt_debugger;
+      $opt_debugger= undef;
+    }
+
     if ( $opt_gdb || $opt_ddd || $opt_manual_gdb || $opt_manual_ddd ||
 	 $opt_manual_debug || $opt_debugger )
     {
@@ -3534,12 +3556,21 @@ sub report_failure_and_restart ($) {
   if ( !defined $tinfo->{logfile} )
   {
     my $logfile= $path_current_testlog;
-    if ( defined $logfile and -f $logfile )
+    if ( defined $logfile )
     {
-      # Test failure was detected by test tool and its report
-      # about what failed has been saved to file. Save the report
-      # in tinfo
-      $tinfo->{logfile}= mtr_fromfile($logfile);
+      if ( -f $logfile )
+      {
+	# Test failure was detected by test tool and its report
+	# about what failed has been saved to file. Save the report
+	# in tinfo
+	$tinfo->{logfile}= mtr_fromfile($logfile);
+      }
+      else
+      {
+	# The test tool report didn't exist, display an
+	# error message
+	$tinfo->{logfile}= "Could not open test tool report '$logfile'";
+      }
     }
   }
 

=== modified file 'sql/sql_class.h'
--- a/sql/sql_class.h	2008-08-25 11:00:00 +0000
+++ b/sql/sql_class.h	2008-08-27 10:02:41 +0000
@@ -1075,6 +1075,7 @@ show_system_thread(enum_thread_type thre
 {
 #define RETURN_NAME_AS_STRING(NAME) case (NAME): return #NAME
   switch (thread) {
+    static char buf[64];
     RETURN_NAME_AS_STRING(NON_SYSTEM_THREAD);
     RETURN_NAME_AS_STRING(SYSTEM_THREAD_DELAYED_INSERT);
     RETURN_NAME_AS_STRING(SYSTEM_THREAD_SLAVE_IO);
@@ -1083,6 +1084,9 @@ show_system_thread(enum_thread_type thre
     RETURN_NAME_AS_STRING(SYSTEM_THREAD_EVENT_SCHEDULER);
     RETURN_NAME_AS_STRING(SYSTEM_THREAD_EVENT_WORKER);
     RETURN_NAME_AS_STRING(SYSTEM_THREAD_BACKUP);
+  default:
+    sprintf(buf, "<UNKNOWN SYSTEM THREAD: %d>", thread);
+    return buf;
   }
 #undef RETURN_NAME_AS_STRING
 }