Commit 53368efe authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-4.0/ 

into serg.mylan:/usr/home/serg/Abk/mysql-4.0
parents b6051940 4924f276

mysql-test/r/merge.result

+1 −1
Original line number Diff line number Diff line
@@ -560,7 +560,7 @@ select * from t6; 
a

1

2

drop table if exists t1, t2, t3, t4, t5, t6;

drop table if exists t6, t5, t4, t3, t2, t1;

DROP TABLE IF EXISTS t1, t2;

CREATE TABLE t1 (

fileset_id tinyint(3) unsigned NOT NULL default '0',

mysql-test/t/merge.test

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ insert into t4 values (1); 
insert into t5 values (2);

create temporary table t6 (a int not null) TYPE=MERGE UNION=(t4,t5);

select * from t6;

drop table if exists t1, t2, t3, t4, t5, t6;

drop table if exists t6, t5, t4, t3, t2, t1;



#

# testing merge::records_in_range and optimizer