Commit 393df2a0 authored by Timothy Smith's avatar Timothy Smith
Browse files

Merge 5.0 main to 5.0-build

parents b0f2e58c 9bc9ddd5

BUILD/check-cpu

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ check_cpu () { 
  fi



  cc_ver=`$cc --version | sed 1q`

  cc_verno=`echo $cc_ver | sed -e 's/^.*gcc/gcc/g; s/[^0-9. ]//g;	 s/^ *//g; s/ .*//g'`

  cc_verno=`echo $cc_ver | sed -e 's/^.*(GCC)//g; s/[^0-9. ]//g;	 s/^ *//g; s/ .*//g'`

  set -- `echo $cc_verno | tr '.' ' '`

  cc_major=$1

  cc_minor=$2

mysql-test/r/federated.result

+11 −0
Original line number Diff line number Diff line
@@ -2071,7 +2071,18 @@ DROP TABLE t1; 
DROP TABLE t1;

CREATE TABLE t1 (a INT) ENGINE=federated CONNECTION='mysql://@:://';

DROP TABLE t1;

CREATE TABLE t1 (a LONGBLOB, b LONGBLOB);

INSERT INTO t1 VALUES ('aaaaaaaaaaaaaaaaaaaaaaaaaaaa', NULL);

CREATE TABLE t1

(a LONGBLOB, b LONGBLOB) ENGINE=FEDERATED

CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/test/t1';

CHECKSUM TABLE t1;

Table	Checksum

test.t1	2465757603

DROP TABLE t1;

DROP TABLE t1;

DROP TABLE IF EXISTS federated.t1;

DROP DATABASE IF EXISTS federated;

DROP TABLE IF EXISTS federated.t1;

DROP DATABASE IF EXISTS federated;

End of 5.0 tests

mysql-test/r/metadata.result

+5 −5
Original line number Diff line number Diff line
@@ -108,11 +108,11 @@ id 
1

select * from v1 group by id limit 0;

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def	test	t1	v1	id	id	3	10	0	Y	32768	0	63

def	test	v1	v1	id	id	3	10	0	Y	32768	0	63

id

select * from v1 where id=1000 group by id;

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def	test	t1	v1	id	id	3	10	0	Y	32768	0	63

def	test	v1	v1	id	id	3	10	0	Y	32768	0	63

id

select * from v1 where id=1 group by id;

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
@@ -126,7 +126,7 @@ renamed 
1

select * from v3 where renamed=1 group by renamed;

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def			v3		renamed	8	12	0	Y	32896	0	63

def		v3	v3	renamed	renamed	8	12	0	Y	32896	0	63

renamed

drop table t1;

drop view v1,v2,v3;
@@ -156,8 +156,8 @@ c1 
3

SELECT v1.c1, v2.c2 FROM v1 JOIN v2 ON c1=c2;

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def	test	t1	v1	c1	c1	254	1	1	Y	0	0	8

def	test	t2	v2	c2	c2	254	1	1	Y	0	0	8

def	test	v1	v1	c1	c1	254	1	1	Y	0	0	8

def	test	v2	v2	c2	c2	254	1	1	Y	0	0	8

c1	c2

1	1

2	2

mysql-test/r/ps_1general.result

+2 −2
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ def table 253 64 2 Y 0 31 8 
def					type	253	10	3	Y	0	31	8

def					possible_keys	253	4096	0	Y	0	31	8

def					key	253	64	0	Y	0	31	8

def					key_len	253	1365	0	Y	0	31	8

def					key_len	253	4096	0	Y	0	31	8

def					ref	253	1024	0	Y	0	31	8

def					rows	8	10	1	Y	32928	0	63

def					Extra	253	255	14	N	1	31	8
@@ -484,7 +484,7 @@ def table 253 64 2 Y 0 31 8 
def					type	253	10	5	Y	0	31	8

def					possible_keys	253	4096	7	Y	0	31	8

def					key	253	64	7	Y	0	31	8

def					key_len	253	1365	1	Y	0	31	8

def					key_len	253	4096	1	Y	0	31	8

def					ref	253	1024	0	Y	0	31	8

def					rows	8	10	1	Y	32928	0	63

def					Extra	253	255	27	N	1	31	8

mysql-test/r/ps_2myisam.result

+1 −1
Original line number Diff line number Diff line
@@ -1158,7 +1158,7 @@ def table 253 64 2 Y 0 31 8 
def					type	253	10	3	Y	0	31	8

def					possible_keys	253	4096	0	Y	0	31	8

def					key	253	64	0	Y	0	31	8

def					key_len	253	1365	0	Y	0	31	8

def					key_len	253	4096	0	Y	0	31	8

def					ref	253	1024	0	Y	0	31	8

def					rows	8	10	1	Y	32928	0	63

def					Extra	253	255	0	N	1	31	8