Commit 9cbfaa67 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/local/bk/mysql-5.0 

into  mysql.com:/usr/home/pem/mysql-5.0


sql/item.cc:
  Auto merged
parents 612b9ceb 06eabeee

mysql-test/r/case.result

+4 −4
Original line number Diff line number Diff line
@@ -103,8 +103,8 @@ t1 CREATE TABLE `t1` ( 
  `c2` varchar(1) character set latin1 collate latin1_danish_ci NOT NULL default '',

  `c3` varbinary(1) NOT NULL default '',

  `c4` varbinary(1) NOT NULL default '',

  `c5` varbinary(4) NOT NULL default '',

  `c6` varbinary(4) NOT NULL default '',

  `c5` varbinary(3) NOT NULL default '',

  `c6` varbinary(3) NOT NULL default '',

  `c7` decimal(2,1) NOT NULL default '0.0',

  `c8` decimal(2,1) NOT NULL default '0.0',

  `c9` decimal(2,1) default NULL,
@@ -152,11 +152,11 @@ SHOW CREATE TABLE t1; 
Table	Create Table

t1	CREATE TABLE `t1` (

  `COALESCE(1)` int(1) NOT NULL default '0',

  `COALESCE(1.0)` decimal(2,1) NOT NULL default '0.0',

  `COALESCE(1.0)` decimal(2,1) unsigned NOT NULL default '0.0',

  `COALESCE('a')` varchar(1) NOT NULL default '',

  `COALESCE(1,1.0)` decimal(2,1) NOT NULL default '0.0',

  `COALESCE(1,'1')` varbinary(1) NOT NULL default '',

  `COALESCE(1.1,'1')` varbinary(4) NOT NULL default '',

  `COALESCE(1.1,'1')` varbinary(3) NOT NULL default '',

  `COALESCE('a' COLLATE latin1_bin,'b')` varchar(1) character set latin1 collate latin1_bin NOT NULL default ''

) ENGINE=MyISAM DEFAULT CHARSET=latin1

DROP TABLE t1;

mysql-test/r/metadata.result

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ drop table if exists t1,t2; 
select 1, 1.0, -1, "hello", NULL;

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

def					1	8	1	1	N	32897	0	63

def					1.0	246	4	3	N	129	1	63

def					1.0	246	3	3	N	161	1	63

def					-1	8	2	2	N	32897	0	63

def					hello	253	5	5	N	1	31	8

def					NULL	6	0	0	Y	32896	0	63

mysql-test/r/ps_2myisam.result

+2 −2
Original line number Diff line number Diff line
@@ -1775,7 +1775,7 @@ Table Create Table 
t5	CREATE TABLE `t5` (

  `const01` bigint(1) NOT NULL default '0',

  `param01` bigint(20) default NULL,

  `const02` decimal(2,1) NOT NULL default '0.0',

  `const02` decimal(2,1) unsigned NOT NULL default '0.0',

  `param02` decimal(65,30) default NULL,

  `const03` double NOT NULL default '0',

  `param03` double default NULL,
@@ -1805,7 +1805,7 @@ select * from t5 ; 
Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def	test	t5	t5	const01	const01	8	1	1	N	32769	0	63

def	test	t5	t5	param01	param01	8	20	1	Y	32768	0	63

def	test	t5	t5	const02	const02	246	4	3	N	1	1	63

def	test	t5	t5	const02	const02	246	3	3	N	33	1	63

def	test	t5	t5	param02	param02	246	67	32	Y	0	30	63

def	test	t5	t5	const03	const03	5	17	1	N	32769	31	63

def	test	t5	t5	param03	param03	5	23	1	Y	32768	31	63

mysql-test/r/ps_3innodb.result

+2 −2
Original line number Diff line number Diff line
@@ -1758,7 +1758,7 @@ Table Create Table 
t5	CREATE TABLE `t5` (

  `const01` bigint(1) NOT NULL default '0',

  `param01` bigint(20) default NULL,

  `const02` decimal(2,1) NOT NULL default '0.0',

  `const02` decimal(2,1) unsigned NOT NULL default '0.0',

  `param02` decimal(65,30) default NULL,

  `const03` double NOT NULL default '0',

  `param03` double default NULL,
@@ -1788,7 +1788,7 @@ select * from t5 ; 
Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def	test	t5	t5	const01	const01	8	1	1	N	32769	0	63

def	test	t5	t5	param01	param01	8	20	1	Y	32768	0	63

def	test	t5	t5	const02	const02	246	4	3	N	1	1	63

def	test	t5	t5	const02	const02	246	3	3	N	33	1	63

def	test	t5	t5	param02	param02	246	67	32	Y	0	30	63

def	test	t5	t5	const03	const03	5	17	1	N	32769	31	63

def	test	t5	t5	param03	param03	5	23	1	Y	32768	31	63

mysql-test/r/ps_4heap.result

+2 −2
Original line number Diff line number Diff line
@@ -1759,7 +1759,7 @@ Table Create Table 
t5	CREATE TABLE `t5` (

  `const01` bigint(1) NOT NULL default '0',

  `param01` bigint(20) default NULL,

  `const02` decimal(2,1) NOT NULL default '0.0',

  `const02` decimal(2,1) unsigned NOT NULL default '0.0',

  `param02` decimal(65,30) default NULL,

  `const03` double NOT NULL default '0',

  `param03` double default NULL,
@@ -1789,7 +1789,7 @@ select * from t5 ; 
Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def	test	t5	t5	const01	const01	8	1	1	N	32769	0	63

def	test	t5	t5	param01	param01	8	20	1	Y	32768	0	63

def	test	t5	t5	const02	const02	246	4	3	N	1	1	63

def	test	t5	t5	const02	const02	246	3	3	N	33	1	63

def	test	t5	t5	param02	param02	246	67	32	Y	0	30	63

def	test	t5	t5	const03	const03	5	17	1	N	32769	31	63

def	test	t5	t5	param03	param03	5	23	1	Y	32768	31	63