From 76b25fc1943e8356db550838950f48dbe78a4ffc Mon Sep 17 00:00:00 2001
From: "joerg@mysql.com" <>
Date: Thu, 26 May 2005 16:47:44 +0200
Subject: [PATCH] Corrected merge error in 'mysql-test/r/select.result': two
 test blocks inserted in wrong order.

---
 mysql-test/r/select.result | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result
index 6e19fa09d1b..eaed7719673 100644
--- a/mysql-test/r/select.result
+++ b/mysql-test/r/select.result
@@ -2423,6 +2423,12 @@ ERROR HY000: Incorrect usage of ALL and DISTINCT
 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 @@ AND FK_firma_id = 2;
 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;