Commit 97b7fbd4 authored by unknown's avatar unknown
Browse files

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/home/ram/work/5.0


BitKeeper/etc/logging_ok:
  auto-union
parents 5426d2ef a3269ecf

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ hf@bisonxp.(none) 
hf@deer.(none)

hf@deer.mysql.r18.ru

hf@genie.(none)

holyfoot@mysql.com

igor@hundin.mysql.fi

igor@linux.local

igor@rurik.mysql.com

include/decimal.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ int decimal2longlong(decimal_t *from, longlong *to); 
int longlong2decimal(longlong from, decimal_t *to);

int decimal2double(decimal_t *from, double *to);

int double2decimal(double from, decimal_t *to);

void decimal_optimize_fraction(decimal_t *from);

int decimal_actual_fraction(decimal_t *from);

int decimal2bin(decimal_t *from, char *to, int precision, int scale);

int bin2decimal(char *from, decimal_t *to, int precision, int scale);

mysql-test/r/case.result

+5 −5
Original line number Diff line number Diff line
@@ -105,9 +105,9 @@ t1 CREATE TABLE `t1` ( 
  `c4` varbinary(1) NOT NULL default '',

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

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

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

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

  `c9` decimal(5,1) default NULL,

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

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

  `c9` decimal(2,1) default NULL,

  `c10` double NOT NULL default '0',

  `c11` double NOT NULL default '0',

  `c12` varbinary(5) NOT NULL default ''
@@ -152,9 +152,9 @@ SHOW CREATE TABLE t1; 
Table	Create Table

t1	CREATE TABLE `t1` (

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

  `COALESCE(1.0)` decimal(5,1) 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(5,1) NOT NULL default '0.0',

  `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('a' COLLATE latin1_bin,'b')` varchar(1) character set latin1 collate latin1_bin NOT NULL default ''

mysql-test/r/create.result

+4 −4
Original line number Diff line number Diff line
@@ -115,9 +115,9 @@ Field Type Null Key Default Extra 
a	datetime	NO		0000-00-00 00:00:00	

b	time	NO		00:00:00	

c	date	NO		0000-00-00	

d	int(2)	NO		0	

e	decimal(6,1)	NO		0.0	

f	bigint(18)	NO		0	

d	int(3)	NO		0	

e	decimal(3,1)	NO		0.0	

f	bigint(19)	NO		0	

drop table t2;

create table t2 select CAST("2001-12-29" AS DATE) as d, CAST("20:45:11" AS TIME) as t, CAST("2001-12-29  20:45:11" AS DATETIME) as dt;

describe t2;
@@ -453,7 +453,7 @@ t2 CREATE TABLE `t2` ( 
  `ifnull(e,e)` bigint(20) default NULL,

  `ifnull(f,f)` float(3,2) default NULL,

  `ifnull(g,g)` double(4,3) default NULL,

  `ifnull(h,h)` decimal(6,4) default NULL,

  `ifnull(h,h)` decimal(5,4) default NULL,

  `ifnull(i,i)` year(4) default NULL,

  `ifnull(j,j)` date default NULL,

  `ifnull(k,k)` datetime NOT NULL default '0000-00-00 00:00:00',

mysql-test/r/distinct.result

+1 −1
Original line number Diff line number Diff line
@@ -462,5 +462,5 @@ rout int(11) default '0' 
INSERT INTO t1 VALUES ('1',1,0);

SELECT DISTINCT html,SUM(rout)/(SUM(rin)+1) as 'prod' FROM t1 GROUP BY rin;

html	prod

1	0.00000

1	0.0000

drop table t1;