Commit c831a156 authored by unknown's avatar unknown
Browse files

postmerge 4.1->5.0 fixes 


mysql-test/r/group_by.result:
  result change
mysql-test/r/union.result:
  result change
mysql-test/r/view.result:
  result change
mysql-test/t/subselect.test:
  fixed mistake of merge
sql/field.cc:
  new 5.0 types support
  temporary table/db names detection in field fixed
sql/field.h:
  removed non-existent methods
  added wrongly deleted during manual merge string
sql/item.cc:
  support of new types added to merge of union types routines
sql/item.h:
  fixed method definition
sql/item_cmpfunc.cc:
  fixed type
sql/item_func.h:
  item type name fixed
sql/item_subselect.cc:
  added forgoten methods
sql/item_subselect.h:
  fixed type
sql/sql_derived.cc:
  fixed typo of manual merge
sql/sql_view.cc:
  added new parameter
parent 8a898a0b

mysql-test/r/group_by.result

+1 −1
Original line number Diff line number Diff line
@@ -696,7 +696,7 @@ from t1 x3, t1 x4, t1 C, t1 D where x3.a < 3 and x4.a < 4 and D.a < 4; 
delete from t2  where a = 2 and b = 'val-2' limit 30;

explain select c from t2 where a = 2 and b = 'val-2' group by c;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	ref	PRIMARY,a	PRIMARY	400	const,const	6	Using where

1	SIMPLE	t2	ref	PRIMARY,a	PRIMARY	402	const,const	6	Using where

select c from t2 where a = 2 and b = 'val-2' group by c;

c

val-74

mysql-test/r/union.result

+2 −2
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ a 
show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` decimal(20,1) NOT NULL default '0.0'

  `a` decimal(19,1) NOT NULL default '0.0'

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

create table t2 (it1 tinyint, it2 tinyint not null, i int not null, ib bigint, f float, d double, y year, da date, dt datetime, sc char(10), sv varchar(10), b blob, tx text);
@@ -1226,7 +1226,7 @@ drop table t2; 
create table t2 select a from t1 union select a from t1;

show columns from t2;

Field	Type	Null	Key	Default	Extra

a	char(1)				

a	varchar(1)	NO			

drop table t2;

create table t2 select a from t1 union select c from t1;

ERROR HY000: Illegal mix of collations (utf8_general_ci,IMPLICIT) and (latin1_swedish_ci,IMPLICIT) for operation 'UNION'

mysql-test/r/view.result

+1 −1
Original line number Diff line number Diff line
@@ -874,7 +874,7 @@ select * from v1; 
col1

describe v1;

Field	Type	Null	Key	Default	Extra

col1	char(2)	YES		NULL	

col1	varchar(2)	YES		NULL	

drop view v1;

drop table `t1a``b`;

create table t1 (col1 char(5),col2 char(5));

mysql-test/t/subselect.test

+1 −1
Original line number Diff line number Diff line
@@ -1726,7 +1726,7 @@ select (select a from t1) = (1,2); 
select (1,2,3) = (select * from t1);

-- error 1241

select (select * from t1) = (1,2,3);

drop table t1

drop table t1;



#

#decimal-related tests

sql/field.cc

+391 −248

File changed.

Preview size limit exceeded, changes collapsed.