bzr push into mysql-trunk branch (sayantan.dutta:3844 to 3845) Bug#13625278

[sayantan.dutta]

 3845 sayantan.dutta@stripped	2012-04-05
      BUG #13625278: INFORMATION OF TEST AFTER PB2 TIMES OUT

    modified:
      mysql-test/mysql-test-run.pl
 3844 Vasil Dimov	2012-04-05
      Switch fts_query_t::total_docs from ulint to ib_int64_t because it
      is assigned from dict_table_t::stat_n_rows which is ib_int64_t.
      
      Adjust the return type of fts_get_total_document_count() and remove
      then unnecessary typecast.

    modified:
      storage/innobase/fts/fts0fts.cc
      storage/innobase/fts/fts0que.cc
      storage/innobase/include/fts0priv.h
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2012-03-08 14:22:07 +0000
+++ b/mysql-test/mysql-test-run.pl	2012-04-05 11:35:31 +0000
@@ -3901,6 +3901,8 @@ sub resfile_report_test ($) {
 sub run_testcase ($) {
   my $tinfo=  shift;
 
+  my $print_freq=20;
+
   mtr_verbose("Running test:", $tinfo->{name});
   resfile_report_test($tinfo) if $opt_resfile;
 
@@ -4059,6 +4061,7 @@ sub run_testcase ($) {
   my $test= start_mysqltest($tinfo);
   # Set only when we have to keep waiting after expectedly died server
   my $keep_waiting_proc = 0;
+  my $print_timeout= start_timer($print_freq * 60);
 
   while (1)
   {
@@ -4083,7 +4086,22 @@ sub run_testcase ($) {
     }
     if (! $keep_waiting_proc)
     {
-      $proc= My::SafeProcess->wait_any_timeout($test_timeout);
+      if($test_timeout > $print_timeout)
+      {
+         $proc= My::SafeProcess->wait_any_timeout($print_timeout);
+         if ( $proc->{timeout} )
+         {
+            #print out that the test is still on
+            mtr_print("Test still running: $tinfo->{name}");
+            #reset the timer
+            $print_timeout= start_timer($print_freq * 60);
+            next;
+         }
+      }
+      else
+      {
+         $proc= My::SafeProcess->wait_any_timeout($test_timeout);
+      }
     }
 
     # Will be restored if we need to keep waiting

No bundle (reason: useless for push emails).