bk commit into 5.0 tree (holyfoot:1.2558)

[holyfoot]

Below is the list of changes that have just been committed into a local
5.0 repository of hf. When hf does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-05 18:23:55+04:00, holyfoot@stripped +1 -0
  merging

  mysql-test/r/func_str.result@stripped, 2007-11-05 18:23:54+04:00, holyfoot@stripped +3 -3
    merging

diff -Nrup a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result
--- a/mysql-test/r/func_str.result	2007-11-05 18:12:03 +04:00
+++ b/mysql-test/r/func_str.result	2007-11-05 18:23:54 +04:00
@@ -722,9 +722,9 @@ Warning	1265	Data truncated for column '
 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 '',