From: Serge Kozlov
Date: February 28 2011 6:54pm
Subject: bzr push into mysql-trunk branch (Serge.Kozlov:3709 to 3710) Bug#548020
List-Archive: http://lists.mysql.com/commits/132147
X-Bug: 548020
Message-Id: <201102281854.p1SIsI37003618@localhost.localdomain>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2000395367=="

--===============2000395367==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 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';


--===============2000395367==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/serge.kozlov@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: serge.kozlov@stripped
# target_branch: file:///home/ksm/oracle/repo/bug54820/mysql-trunk/
# testament_sha1: 6af14887290bb66d6e144a90f645d4a1a6f5f12e
# timestamp: 2011-02-28 21:54:18 +0300
# source_branch: file:///home/ksm/oracle/repo/bug54820/mysql-5.5/
# base_revision_id: tor.didriksen@stripped\
#   asncm330rif3v000
# 
# Begin bundle
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
kinChIdt5hfY


--===============2000395367==--