bzr push into mysql-trunk branch (Serge.Kozlov:3709 to 3710) Bug#548020

[Serge Kozlov]

 3710 Serge Kozlov	2011-02-28 [merge]
      Bug#548020. merge 5.5->trunk

    modified:
      mysql-test/collections/default.experimental
      mysql-test/include/wait_for_status_var.inc
 3709 Tor Didriksen	2011-02-24 [merge]
      merge 5.5 => trunk

    modified:
      mysql-test/r/filesort_debug.result
      mysql-test/t/filesort_debug.test
      sql/filesort.cc
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2011-02-18 13:02:21 +0000
+++ b/mysql-test/collections/default.experimental	2011-02-28 18:50:04 +0000
@@ -16,7 +16,6 @@ main.subquery_sj_none @solaris          
 main.type_float @freebsd                 # Bug#38965 2010-05-04 alik test cases gis-rtree, type_float, type_newdecimal fail in embedded server
 main.wait_timeout @solaris               # Bug#51244 2010-04-26 alik wait_timeout fails on OpenSolaris
 
-rpl.rpl_heartbeat_basic                  # BUG#54820 2010-06-26 alik rpl.rpl_heartbeat_basic fails sporadically again
 rpl.rpl_innodb_bug28430                  # Bug#46029
 rpl.rpl_row_sp011  @solaris              # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
 rpl.rpl_delayed_slave                    # BUG#57514 rpl_delayed_slave fails sporadically in pb

=== modified file 'mysql-test/include/wait_for_status_var.inc'
--- a/mysql-test/include/wait_for_status_var.inc	2011-01-13 21:18:17 +0000
+++ b/mysql-test/include/wait_for_status_var.inc	2011-02-27 20:23:44 +0000
@@ -61,7 +61,7 @@ let $_show_status_value= query_get_value
 
 # Set way of comparing
 let $_query= SELECT NOT('$_show_status_value' $_status_var_comparsion '$status_var_value');
-if ($is_number)
+if ($_is_number)
 {
   let $_query= SELECT NOT($_show_status_value $_status_var_comparsion $status_var_value);
 }
@@ -70,7 +70,7 @@ while (`$_query`)
 {
   if (!$_status_timeout_counter)
   {
-    --echo **** ERROR: failed while waiting for $status_type $status_var $_status_var_comparison $status_var_value ****
+    --echo **** ERROR: failed while waiting for $status_type $status_var $_status_var_comparsion $status_var_value ****
     --echo Note: the following output may have changed since the failure was detected
     --echo **** Showing STATUS, PROCESSLIST ****
     eval SHOW $status_type STATUS LIKE '$status_var';


Attachment: [text/bzr-bundle] bzr/[e-mail]