bk commit into 5.1 tree (gluh:1.2614)

[gluh]

Below is the list of changes that have just been committed into a local
5.1 repository of gluh. When gluh 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-10-29 15:49:56+04:00, gluh@stripped +1 -0
  after merge fix

  mysql-test/r/type_decimal.result@stripped, 2007-10-29 15:49:54+04:00, gluh@stripped +2 -2
    after merge fix

diff -Nrup a/mysql-test/r/type_decimal.result b/mysql-test/r/type_decimal.result
--- a/mysql-test/r/type_decimal.result	2007-10-29 15:40:38 +04:00
+++ b/mysql-test/r/type_decimal.result	2007-10-29 15:49:54 +04:00
@@ -881,8 +881,8 @@ Note	1265	Data truncated for column 'a' 
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` decimal(10,0) default NULL,
-  `b` int(11) default NULL
+  `a` decimal(10,0) DEFAULT NULL,
+  `b` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select round(a,b) as c from t1 order by c;
 c