Commit 2a29fbfc authored by unknown's avatar unknown
Browse files

type_newdecimal.result, case.result: 

  Adjusted merge


mysql-test/r/case.result:
  Adjusted merge
mysql-test/r/type_newdecimal.result:
  Adjusted merge
parent e78b4cca

mysql-test/r/case.result

+3 −3
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(3) NOT NULL DEFAULT '',

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

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

  `c6` varbinary(4) 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,
@@ -156,7 +156,7 @@ t1 CREATE TABLE `t1` ( 
  `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(3) 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 ''

) ENGINE=MyISAM DEFAULT CHARSET=latin1

DROP TABLE t1;

mysql-test/r/type_newdecimal.result

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

  `nullif(1.1, 1.1)` decimal(2,1) DEFAULT NULL,

  `nullif(1.1, 1.2)` decimal(2,1) DEFAULT NULL,

  `nullif(1.1, 0.11e1)` decimal(2,1) unsigned DEFAULT NULL,

  `nullif(1.1, 0.11e1)` decimal(2,1) DEFAULT NULL,

  `nullif(1.0, 1)` decimal(2,1) DEFAULT NULL,

  `nullif(1, 1.0)` int(1) DEFAULT NULL,

  `nullif(1, 1.1)` int(1) DEFAULT NULL
@@ -176,7 +176,7 @@ Table Create Table 
t1	CREATE TABLE `t1` (

  `round(15.4,-1)` decimal(3,0) NOT NULL DEFAULT '0',

  `truncate(-5678.123451,-3)` decimal(4,0) NOT NULL DEFAULT '0',

  `abs(-1.1)` decimal(2,1) NOT NULL DEFAULT '0.0',

  `abs(-1.1)` decimal(3,1) NOT NULL DEFAULT '0.0',

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

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;