bzr push into mysql-5.1 branch (bjorn.munch:3596 to 3597)

[Bjorn Munch]

 3597 Bjorn Munch	2011-08-30 [merge]
      merge from 5.1-mtr

    modified:
      mysql-test/include/mtr_check.sql
      mysql-test/lib/mtr_cases.pm
      mysql-test/suite/ndb/t/ndb_partition_error2.test
 3596 Tor Didriksen	2011-08-30 [merge]
      local merge

    modified:
      mysql-test/r/group_by.result
      mysql-test/t/group_by.test
      sql/filesort.cc
=== modified file 'mysql-test/include/mtr_check.sql'
--- a/mysql-test/include/mtr_check.sql	2011-07-04 07:33:16 +0000
+++ b/mysql-test/include/mtr_check.sql	2011-08-17 12:42:18 +0000
@@ -72,3 +72,13 @@ BEGIN
     mysql.user;
 
 END||
+
+--
+-- Procedure used by test case used to force all
+-- servers to restart after testcase and thus skipping
+-- check test case after test
+--
+CREATE DEFINER=root@localhost PROCEDURE force_restart()
+BEGIN
+  SELECT 1 INTO OUTFILE 'force_restart';
+END||

=== modified file 'mysql-test/lib/mtr_cases.pm'
--- a/mysql-test/lib/mtr_cases.pm	2010-12-29 15:01:07 +0000
+++ b/mysql-test/lib/mtr_cases.pm	2011-07-28 10:54:02 +0000
@@ -317,10 +317,30 @@ sub collect_one_suite($)
   my %disabled;
   if ( open(DISABLED, "$testdir/disabled.def" ) )
   {
+    # $^O on Windows considered not generic enough
+    my $plat= (IS_WINDOWS) ? 'windows' : $^O;
+
     while ( <DISABLED> )
       {
         chomp;
-        if ( /^\s*(\S+)\s*:\s*(.*?)\s*$/ )
+        #diasble the test case if platform matches
+        if ( /\@/ )
+          {
+             if ( /\@$plat/ )
+               {
+        	  /^\s*(\S+)\s*\@$plat.*:\s*(.*?)\s*$/ ;
+                  $disabled{$1}= $2;
+               }
+             elsif ( /\@!(\S*)/ )
+               {
+                  if ( $1 ne $plat)
+                    {
+        	       /^\s*(\S+)\s*\@!.*:\s*(.*?)\s*$/ ;
+                       $disabled{$1}= $2;
+                    }
+               }
+          }
+       elsif ( /^\s*(\S+)\s*:\s*(.*?)\s*$/ )
           {
             $disabled{$1}= $2;
           }

=== modified file 'mysql-test/suite/ndb/t/ndb_partition_error2.test'
--- a/mysql-test/suite/ndb/t/ndb_partition_error2.test	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/ndb/t/ndb_partition_error2.test	2011-07-28 11:01:51 +0000
@@ -1,3 +1,4 @@
+-- source include/have_ndb.inc
 disable_query_log;
 --require r/true.require
 select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'ndbcluster';

No bundle (reason: useless for push emails).