From df4cfc0bc178c8dfc61e9c07c564ed73b38aeee6 Mon Sep 17 00:00:00 2001
From: "ramil/ram@mysql.com/ramil.myoffice.izhnet.ru" <>
Date: Mon, 22 Jan 2007 15:26:49 +0400
Subject: [PATCH] after-merge fix.

---
 mysql-test/r/select.result | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result
index ff7baa6ac12..d4328d9cf80 100644
--- a/mysql-test/r/select.result
+++ b/mysql-test/r/select.result
@@ -3652,9 +3652,9 @@ coalesce(9223372036854775808, 1) co;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `i` decimal(19,0) NOT NULL default '0',
-  `c` decimal(19,0) NOT NULL default '0',
-  `co` decimal(19,0) NOT NULL default '0'
+  `i` decimal(19,0) NOT NULL DEFAULT '0',
+  `c` decimal(19,0) NOT NULL DEFAULT '0',
+  `co` decimal(19,0) NOT NULL DEFAULT '0'
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select