Commit eae62b1d authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-5.0-clean 

into  mysql.com:/home/jimw/my/mysql-5.1-clean
parents 6653213a 3c8a8de4

mysql-test/r/union.result

+26 −26
Original line number Diff line number Diff line
@@ -1220,6 +1220,32 @@ show columns from t2; 
Field	Type	Null	Key	Default	Extra

a	varchar(3)	YES		NULL	

drop table t2, t1;

create table t1 (f1 decimal(60,25), f2 decimal(60,25));

insert into t1 values (0.0,0.0);

select f1 from t1 union all select f2 from t1;

f1

0.0000000000000000000000000

0.0000000000000000000000000

select 'XXXXXXXXXXXXXXXXXXXX' as description, f1 from t1

union all

select 'YYYYYYYYYYYYYYYYYYYY' as description, f2 from t1;

description	f1

XXXXXXXXXXXXXXXXXXXX	0.0000000000000000000000000

YYYYYYYYYYYYYYYYYYYY	0.0000000000000000000000000

drop table t1;

create table t1 (f1 decimal(60,24), f2 decimal(60,24));

insert into t1 values (0.0,0.0);

select f1 from t1 union all select f2 from t1;

f1

0.000000000000000000000000

0.000000000000000000000000

select 'XXXXXXXXXXXXXXXXXXXX' as description, f1 from t1

union all

select 'YYYYYYYYYYYYYYYYYYYY' as description, f2 from t1;

description	f1

XXXXXXXXXXXXXXXXXXXX	0.000000000000000000000000

YYYYYYYYYYYYYYYYYYYY	0.000000000000000000000000

drop table t1;

create table t1 (a varchar(5));

create table t2 select * from t1 union select 'abcdefghijkl';

show create table t2;
@@ -1270,29 +1296,3 @@ id 
5

99

drop table t1;
 
create table t1 (f1 decimal(60,25), f2 decimal(60,25));

insert into t1 values (0.0,0.0);

select f1 from t1 union all select f2 from t1;

f1

0.0000000000000000000000000

0.0000000000000000000000000

select 'XXXXXXXXXXXXXXXXXXXX' as description, f1 from t1

union all

select 'YYYYYYYYYYYYYYYYYYYY' as description, f2 from t1;

description	f1

XXXXXXXXXXXXXXXXXXXX	0.0000000000000000000000000

YYYYYYYYYYYYYYYYYYYY	0.0000000000000000000000000

drop table t1;

create table t1 (f1 decimal(60,24), f2 decimal(60,24));

insert into t1 values (0.0,0.0);

select f1 from t1 union all select f2 from t1;

f1

0.000000000000000000000000

0.000000000000000000000000

select 'XXXXXXXXXXXXXXXXXXXX' as description, f1 from t1

union all

select 'YYYYYYYYYYYYYYYYYYYY' as description, f2 from t1;

description	f1

XXXXXXXXXXXXXXXXXXXX	0.000000000000000000000000

YYYYYYYYYYYYYYYYYYYY	0.000000000000000000000000

drop table t1;

scripts/mysqlhotcopy.sh

+1 −0
Original line number Diff line number Diff line
@@ -252,6 +252,7 @@ if ( defined $opt{regexp} ) { 
    my $sth_dbs = $dbh->prepare("show databases");

    $sth_dbs->execute;

    while ( my ($db_name) = $sth_dbs->fetchrow_array ) {

	next if $db_name =~ m/^information_schema$/i;

	push @db_desc, { 'src' => $db_name, 't_regex' => $t_regex } if ( $db_name =~ m/$opt{regexp}/o );

    }

}