Commit df16d859 authored by unknown's avatar unknown
Browse files

Corrected merge error in 'mysql-test/r/select.result': two test blocks inserted in wrong order. 


mysql-test/r/select.result:
  Corrected merge error (two test blocks inserted in wrong order).
parent 763f04ad

mysql-test/r/select.result

+6 −6
Original line number Diff line number Diff line
@@ -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;