From 552c208bfe3bd0e7cb1a2a3501d5226b0ac4726c Mon Sep 17 00:00:00 2001
From: "jimw@mysql.com" <>
Date: Fri, 28 Oct 2005 10:16:44 -0700
Subject: [PATCH] Update test with changed result after merge

---
 mysql-test/r/type_newdecimal.result | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql-test/r/type_newdecimal.result b/mysql-test/r/type_newdecimal.result
index dbae646c362..45eb8aab89e 100644
--- a/mysql-test/r/type_newdecimal.result
+++ b/mysql-test/r/type_newdecimal.result
@@ -176,7 +176,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `round(15.4,-1)` decimal(3,0) unsigned 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(2,1) default NULL,
   `-(-1.1)` decimal(2,1) NOT NULL default '0.0'
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;