From 1bb1679c19614f3a2883e76fd03b09a216be4892 Mon Sep 17 00:00:00 2001
From: unknown <msvensson@shellback.(none)>
Date: Fri, 1 Sep 2006 10:21:08 +0200
Subject: [PATCH 1/3] Add target to make "mtr", shortcut for running test suite

BitKeeper/etc/ignore:
  Added mysql-test/mtr to the ignore list
---
 .bzrignore             | 1 +
 mysql-test/Makefile.am | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.bzrignore b/.bzrignore
index 6dd06504096..4325a9177fa 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1059,3 +1059,4 @@ vio/test-sslserver
 vio/viotest-ssl
 libmysql/libmysql.ver
 libmysqld/sql_locale.cc
+mysql-test/mtr
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
index cd939417e64..1e6eb12f7b2 100644
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -34,7 +34,7 @@ benchdir_root=		$(prefix)
 testdir =	        $(benchdir_root)/mysql-test
 EXTRA_SCRIPTS = 	mysql-test-run.sh install_test_db.sh $(PRESCRIPTS)
 EXTRA_DIST = 		$(EXTRA_SCRIPTS) 
-GENSCRIPTS =		mysql-test-run install_test_db
+GENSCRIPTS =		mysql-test-run install_test_db mtr
 PRESCRIPTS =		mysql-test-run.pl
 test_SCRIPTS = 		$(GENSCRIPTS) $(PRESCRIPTS)
 test_DATA = std_data/client-key.pem std_data/client-cert.pem std_data/cacert.pem \
@@ -105,6 +105,11 @@ std_data/server-cert.pem:
 std_data/server-key.pem:
 	@CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data
 
+# mtr - a shortcut for executing mysql-test-run.pl
+mtr:
+	$(RM) -f mtr
+	$(LN_S) mysql-test-run.pl mtr
+
 SUFFIXES = .sh
 
 .sh:

From 30eaa0b19c0f14dfd1b82b1c37480bc7b2e12558 Mon Sep 17 00:00:00 2001
From: unknown <msvensson@neptunus.(none)>
Date: Fri, 1 Sep 2006 13:53:43 +0200
Subject: [PATCH 2/3] Fix problem with windows where stderr is not flushed
 until end of program.

client/mysqldump.c:
  fflush stderr after writing to it.
---
 client/mysqldump.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/mysqldump.c b/client/mysqldump.c
index d6f89022e32..e774a07295b 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -852,6 +852,7 @@ static void DB_error(MYSQL *mysql, const char *when)
   DBUG_ENTER("DB_error");
   fprintf(stderr, "%s: Got error: %d: %s %s\n", my_progname,
           mysql_errno(mysql), mysql_error(mysql), when);
+  fflush(stderr);
   safe_exit(EX_MYSQLERR);
   DBUG_VOID_RETURN;
 } /* DB_error */

From 9e145670c41ee58bb4e707988a1b4c6f58dda0b6 Mon Sep 17 00:00:00 2001
From: unknown <cmiller@maint1.mysql.com>
Date: Fri, 1 Sep 2006 21:53:23 +0200
Subject: [PATCH 3/3] mtr_cases.pl:   Provide a more extensible,
 easier-to-change way of reordering   test cases.

mysql-test/lib/mtr_cases.pl:
  Provide a more extensible, easier-to-change way of reordering
  test cases.
---
 mysql-test/lib/mtr_cases.pl | 58 ++++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 27 deletions(-)

diff --git a/mysql-test/lib/mtr_cases.pl b/mysql-test/lib/mtr_cases.pl
index ed0395abd9d..009269f382e 100644
--- a/mysql-test/lib/mtr_cases.pl
+++ b/mysql-test/lib/mtr_cases.pl
@@ -82,7 +82,7 @@ sub collect_test_cases ($) {
 
         if ( $mysqld_test_exists and $im_test_exists )
         {
-          mtr_error("Ambiguos test case name ($tname)");
+          mtr_error("Ambiguous test case name ($tname)");
         }
         elsif ( ! $mysqld_test_exists and ! $im_test_exists )
         {
@@ -154,34 +154,38 @@ sub collect_test_cases ($) {
 
   if ( $::opt_reorder )
   {
-    @$cases = sort {
-      if ( ! $a->{'master_restart'} and ! $b->{'master_restart'} )
-      {
-        return $a->{'name'} cmp $b->{'name'};
-      }
 
-      if ( $a->{'master_restart'} and $b->{'master_restart'} )
-      {
-        my $cmp= mtr_cmp_opts($a->{'master_opt'}, $b->{'master_opt'});
-        if ( $cmp == 0 )
-        {
-          return $a->{'name'} cmp $b->{'name'};
-        }
-        else
-        {
-          return $cmp;
-        }
-      }
+    my %sort_criteria;
+    my $tinfo;
 
-      if ( $a->{'master_restart'} )
-      {
-        return 1;                 # Is greater
-      }
-      else
-      {
-        return -1;                # Is less
-      }
-    } @$cases;
+    # Make a mapping of test name to a string that represents how that test
+    # should be sorted among the other tests.  Put the most important criterion
+    # first, then a sub-criterion, then sub-sub-criterion, et c.
+    foreach $tinfo (@$cases) 
+    {
+      my @this_criteria = ();
+
+      # Append the criteria for sorting, in order of importance.
+      push(@this_criteria, join("!", sort @{$tinfo->{'master_opt'}}) . "~");  # Ending with "~" makes empty sort later than filled
+      push(@this_criteria, "ndb=" . ($tinfo->{'ndb_test'} ? "1" : "0"));
+      push(@this_criteria, "restart=" . ($tinfo->{'master_restart'} ? "1" : "0"));
+      push(@this_criteria, "big_test=" . ($tinfo->{'big_test'} ? "1" : "0"));
+      push(@this_criteria, join("|", sort keys %{$tinfo}));  # Group similar things together.  The values may differ substantially.  FIXME?
+      push(@this_criteria, $tinfo->{'name'});   # Finally, order by the name
+      
+      $sort_criteria{$tinfo->{"name"}} = join(" ", @this_criteria);
+    }
+
+    @$cases = sort { $sort_criteria{$a->{"name"}} cmp $sort_criteria{$b->{"name"}}; } @$cases;
+
+###  For debugging the sort-order
+#    foreach $tinfo (@$cases) 
+#    {
+#      print $sort_criteria{$tinfo->{"name"}};
+#      print " -> \t";
+#      print $tinfo->{"name"};
+#      print "\n";
+#    }
   }
 
   return $cases;