1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
This commit is contained in:
unknown 2004-03-04 14:48:28 +01:00
commit 53368efea3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/merge.result
View File

@ -560,7 +560,7 @@ select * from t6;
a a
1 1
2 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; DROP TABLE IF EXISTS t1, t2;
CREATE TABLE t1 ( CREATE TABLE t1 (
fileset_id tinyint(3) unsigned NOT NULL default '0', fileset_id tinyint(3) unsigned NOT NULL default '0',

2
mysql-test/t/merge.test
View File

@ -202,7 +202,7 @@ insert into t4 values (1);
insert into t5 values (2); insert into t5 values (2);
create temporary table t6 (a int not null) TYPE=MERGE UNION=(t4,t5); create temporary table t6 (a int not null) TYPE=MERGE UNION=(t4,t5);
select * from t6; 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 # testing merge::records_in_range and optimizer