database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge mysql.com:/home/mydev/mysql-4.1-4100

Browse Source 
into  mysql.com:/home/mydev/mysql-5.0-5000


mysql-test/r/merge.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
This commit is contained in:
unknown
2005-09-28 14:10:02 +02:00
parent ada963e012 e4074a6753
commit 4ac453e50a
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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