From bc1e69d4530c093267a39180aefeba855c607674 Mon Sep 17 00:00:00 2001
From: "ramil/ram@mysql.com/myoffice.izhnet.ru" <>
Date: Mon, 14 Aug 2006 10:54:24 +0500
Subject: [PATCH 1/2] Restore alphabetical order of the system variables.

---
 sql/set_var.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/set_var.cc b/sql/set_var.cc
index 1d994f1c98f..4acedc7bcbd 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -738,8 +738,8 @@ struct show_var_st init_vars[]= {
   {"have_geometry",           (char*) &have_geometry,               SHOW_HAVE},
   {"have_innodb",	      (char*) &have_innodb,		    SHOW_HAVE},
   {"have_isam",		      (char*) &have_isam,		    SHOW_HAVE},
-  {"have_ndbcluster",         (char*) &have_ndbcluster,             SHOW_HAVE},
   {"have_merge_engine",       (char*) &have_merge_db,               SHOW_HAVE},
+  {"have_ndbcluster",         (char*) &have_ndbcluster,             SHOW_HAVE},
   {"have_openssl",	      (char*) &have_openssl,		    SHOW_HAVE},
   {"have_query_cache",        (char*) &have_query_cache,            SHOW_HAVE},
   {"have_raid",		      (char*) &have_raid,		    SHOW_HAVE},

From dc4b2a4f1dc6ea2533e75f3eb8397c5c1ad9fbf8 Mon Sep 17 00:00:00 2001
From: "ramil/ram@mysql.com/myoffice.izhnet.ru" <>
Date: Mon, 14 Aug 2006 12:59:54 +0500
Subject: [PATCH 2/2] Make the heap_btree test repeatable.

---
 mysql-test/r/heap_btree.result | 14 +++++++-------
 mysql-test/t/heap_btree.test   |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mysql-test/r/heap_btree.result b/mysql-test/r/heap_btree.result
index 91c3ec65a13..e6492e90b80 100644
--- a/mysql-test/r/heap_btree.result
+++ b/mysql-test/r/heap_btree.result
@@ -255,27 +255,27 @@ a
 3
 3
 delete from t1 where a < 4;
-select a from t1;
+select a from t1 order by a;
 a
 insert into t1 values (2), (2), (2), (1), (1), (3), (3), (3), (3);
 select a from t1 where a > 4;
 a
 delete from t1 where a > 4;
-select a from t1;
+select a from t1 order by a;
 a
-3
-3
 1
-3
-3
 1
 2
 2
 2
+3
+3
+3
+3
 select a from t1 where a > 3;
 a
 delete from t1 where a >= 2;
-select a from t1;
+select a from t1 order by a;
 a
 1
 1
diff --git a/mysql-test/t/heap_btree.test b/mysql-test/t/heap_btree.test
index f510f97fe9b..9aa820becd9 100644
--- a/mysql-test/t/heap_btree.test
+++ b/mysql-test/t/heap_btree.test
@@ -172,14 +172,14 @@ create table t1(a int not null, key using btree(a)) engine=heap;
 insert into t1 values (2), (2), (2), (1), (1), (3), (3), (3), (3);
 select a from t1 where a > 2;
 delete from t1 where a < 4;
-select a from t1;
+select a from t1 order by a;
 insert into t1 values (2), (2), (2), (1), (1), (3), (3), (3), (3);
 select a from t1 where a > 4;
 delete from t1 where a > 4;
-select a from t1;
+select a from t1 order by a;
 select a from t1 where a > 3;
 delete from t1 where a >= 2;
-select a from t1;
+select a from t1 order by a;
 drop table t1;
 
 --echo End of 4.1 tests