bk commit into 5.0 tree (joerg:1.1915)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
5.0 repository of joerg. When joerg 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
  1.1915 05/05/26 16:47:44 joerg@stripped +1 -0
  Corrected merge error in 'mysql-test/r/select.result': two test blocks inserted in wrong order.

  mysql-test/r/select.result
    1.63 05/05/26 16:47:38 joerg@stripped +6 -6
    Corrected merge error (two test blocks inserted in wrong order).

# 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:	joerg
# Host:	trift2.
# Root:	/M50/merge-5.0

--- 1.62/mysql-test/r/select.result	Thu May 26 12:19:37 2005
+++ 1.63/mysql-test/r/select.result	Thu May 26 16:47:38 2005
@@ -2423,6 +2423,12 @@
 select distinct all * from t1;
 ERROR HY000: Incorrect usage of ALL and DISTINCT
 drop table t1;
+CREATE TABLE t1 (b BIGINT(20) UNSIGNED NOT NULL, PRIMARY KEY (b));
+INSERT INTO t1 VALUES (0x8000000000000000);
+SELECT b FROM t1 WHERE b=0x8000000000000000;
+b
+9223372036854775808
+DROP TABLE t1;
 CREATE TABLE t1 ( 
 K2C4 varchar(4) character set latin1 collate latin1_bin NOT NULL default '', 
 K4N4 varchar(4) character set latin1 collate latin1_bin NOT NULL default '0000', 
@@ -2676,9 +2682,3 @@
 COUNT(*)
 0
 drop table t1;
-CREATE TABLE t1 (b BIGINT(20) UNSIGNED NOT NULL, PRIMARY KEY (b));
-INSERT INTO t1 VALUES (0x8000000000000000);
-SELECT b FROM t1 WHERE b=0x8000000000000000;
-b
-9223372036854775808
-DROP TABLE t1;