mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysql.com:/home/mydev/mysql-4.0-4000

Browse source 
into  mysql.com:/home/mydev/mysql-4.1-4100
This commit is contained in:
ingo@mysql.com 2005-09-27 15:42:14 +02:00
commit a3618b128b
2 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
mysql-test/r/merge.result
View file

@ -652,30 +652,30 @@ create table t3 engine=merge union=(t1, t2) select * from t2;
ERROR HY000: You can't specify target table 't2' for update in FROM clause
drop table t1, t2;
create table t1 (
a double(16,6),
a double(14,4),
b varchar(10),
index (a,b)
) engine=merge union=(t2,t3);
create table t2 (
a double(16,6),
a double(14,4),
b varchar(10),
index (a,b)
) engine=myisam;
create table t3 (
a double(16,6),
a double(14,4),
b varchar(10),
index (a,b)
) engine=myisam;
insert into t2 values ( null, '');
insert into t2 values ( 9999999999.999999, '');
insert into t2 values ( 9999999999.9999, '');
insert into t3 select * from t2;
select min(a), max(a) from t1;
min(a) max(a)
9999999999.999998 9999999999.999998
9999999999.9999 9999999999.9999
flush tables;
select min(a), max(a) from t1;
min(a) max(a)
9999999999.999998 9999999999.999998
9999999999.9999 9999999999.9999
drop table t1, t2, t3;
create table t1 (a int,b int,c int, index (a,b,c));
create table t2 (a int,b int,c int, index (a,b,c));

12
mysql-test/t/merge.test
View file

@ -294,29 +294,25 @@ drop table t1, t2;
# non-debug build. But there is no guarantee that this will be always so.
#
create table t1 (
a double(16,6),
a double(14,4),
b varchar(10),
index (a,b)
) engine=merge union=(t2,t3);
create table t2 (
a double(16,6),
a double(14,4),
b varchar(10),
index (a,b)
) engine=myisam;
create table t3 (
a double(16,6),
a double(14,4),
b varchar(10),
index (a,b)
) engine=myisam;
insert into t2 values ( null, '');
# We may have insufficient accuracy for 16 digits of '9'.
# Suppress a "truncate" warning due to accuracy problems.
--disable_warnings
insert into t2 values ( 9999999999.999999, '');
--enable_warnings
insert into t2 values ( 9999999999.9999, '');
insert into t3 select * from t2;
select min(a), max(a) from t1;
flush tables;