bk commit into 5.1 tree (ramil:1.2428)

[ramil]

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

  mysql-test/r/select.result@stripped, 2007-01-22 15:26:47+04:00, ramil@stripped +3 -3
    results adjusted.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	ramil
# Host:	ramil.myoffice.izhnet.ru
# Root:	/home/ram/work/b22026/b22026.5.1

--- 1.144/mysql-test/r/select.result	2007-01-22 15:26:53 +04:00
+++ 1.145/mysql-test/r/select.result	2007-01-22 15:26:53 +04:00
@@ -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