bk commit into 4.1 tree (ramil:1.2536)

[ramil]

Below is the list of changes that have just been committed into a local
4.1 repository of ram. When ram does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-08-14 12:59:54+05:00, ramil@stripped +2 -0
  Make the heap_btree test repeatable.

  mysql-test/r/heap_btree.result@stripped, 2006-08-14 12:59:51+05:00, ramil@stripped +7 -7
    Make the heap_btree test repeatable.
      - 'order by' added where we don't use the 'a' index.

  mysql-test/t/heap_btree.test@stripped, 2006-08-14 12:59:51+05:00, ramil@stripped +3 -3
    Make the heap_btree test repeatable.
      - 'order by' added where we don't use the 'a' index.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	ramil
# Host:	myoffice.izhnet.ru
# Root:	/usr/home/ram/work/mysql-4.1

--- 1.18/mysql-test/r/heap_btree.result	2006-08-14 12:59:58 +05:00
+++ 1.19/mysql-test/r/heap_btree.result	2006-08-14 12:59:58 +05:00
@@ -255,27 +255,27 @@
 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

--- 1.14/mysql-test/t/heap_btree.test	2006-08-14 12:59:58 +05:00
+++ 1.15/mysql-test/t/heap_btree.test	2006-08-14 12:59:58 +05:00
@@ -172,14 +172,14 @@
 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