Commit e78b4cca authored by unknown's avatar unknown
Browse files

Merge mysql.com:/data0/mysqldev/my/tmp_merge 

into  mysql.com:/tmp/mysql-5.1-new


mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
sql/item.cc:
  Auto merged
parents 8df5fdb9 fe3ac300

mysql-test/r/case.result

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ 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) unsigned NOT NULL DEFAULT '0.0',

  `COALESCE(1.0)` decimal(2,1) 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 '',

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	3	3	N	161	1	63

def					1.0	246	4	3	N	129	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
@@ -1777,7 +1777,7 @@ Table Create Table 
t5	CREATE TABLE `t5` (

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

  `param01` bigint(20) DEFAULT NULL,

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

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

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

  `const03` double NOT NULL DEFAULT '0',

  `param03` double DEFAULT NULL,
@@ -1807,7 +1807,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	3	3	N	33	1	63

def	test	t5	t5	const02	const02	246	4	3	N	1	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
@@ -1760,7 +1760,7 @@ Table Create Table 
t5	CREATE TABLE `t5` (

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

  `param01` bigint(20) DEFAULT NULL,

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

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

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

  `const03` double NOT NULL DEFAULT '0',

  `param03` double DEFAULT NULL,
@@ -1790,7 +1790,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	3	3	N	33	1	63

def	test	t5	t5	const02	const02	246	4	3	N	1	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
@@ -1761,7 +1761,7 @@ Table Create Table 
t5	CREATE TABLE `t5` (

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

  `param01` bigint(20) DEFAULT NULL,

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

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

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

  `const03` double NOT NULL DEFAULT '0',

  `param03` double DEFAULT NULL,
@@ -1791,7 +1791,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	3	3	N	33	1	63

def	test	t5	t5	const02	const02	246	4	3	N	1	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