From 18ab121a3c695ed296e97da3fbe43ca4caa29be9 Mon Sep 17 00:00:00 2001
From: "holyfoot/hf@mysql.com/hfmain.(none)" <>
Date: Mon, 5 Nov 2007 18:23:55 +0400
Subject: [PATCH] merging

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

diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result
index d6879a8e756..d0809eca65b 100644
--- a/mysql-test/r/func_str.result
+++ b/mysql-test/r/func_str.result
@@ -722,9 +722,9 @@ Warning	1265	Data truncated for column 'format(130,10)' at row 1
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `bin(130)` varchar(64) NOT NULL default '',
-  `oct(130)` varchar(64) NOT NULL default '',
-  `conv(130,16,10)` varchar(64) NOT NULL default '',
+  `bin(130)` varchar(64) default NULL,
+  `oct(130)` varchar(64) default NULL,
+  `conv(130,16,10)` varchar(64) default NULL,
   `hex(130)` varchar(6) NOT NULL default '',
   `char(130)` varbinary(4) NOT NULL default '',
   `format(130,10)` varchar(4) NOT NULL default '',