bk commit into 5.1 tree (holyfoot:1.2499)

[holyfoot]

Below is the list of changes that have just been committed into a local
5.1 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-03-23 01:04:31+04:00, holyfoot@stripped +4 -0
  merging

  mysql-test/r/create.result@stripped, 2007-03-23 01:04:28+04:00, holyfoot@stripped +15 -15
    merging

  mysql-test/r/type_float.result@stripped, 2007-03-23 01:04:28+04:00, holyfoot@stripped +5 -5
    merging

  mysql-test/r/union.result@stripped, 2007-03-23 01:04:28+04:00, holyfoot@stripped +2 -2
    merging

  mysql-test/r/view.result@stripped, 2007-03-23 01:04:28+04:00, holyfoot@stripped +0 -2
    merging

# 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:	holyfoot
# Host:	hfmain.(none)
# Root:	/home/hf/work/mrg/mysql-5.1-opt

--- 1.97/mysql-test/r/union.result	2007-03-23 01:04:35 +04:00
+++ 1.98/mysql-test/r/union.result	2007-03-23 01:04:35 +04:00
@@ -554,7 +554,7 @@ aa
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varbinary(2) NOT NULL default ''
+  `a` varbinary(2) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 SELECT 12 as a UNION select 12.2 as a;
@@ -655,7 +655,7 @@ f
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `f` varbinary(12) default NULL
+  `f` varbinary(12) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 SELECT y from t2 UNION select da from t2;

--- 1.216/mysql-test/r/view.result	2007-03-23 01:04:35 +04:00
+++ 1.217/mysql-test/r/view.result	2007-03-23 01:04:35 +04:00
@@ -3338,8 +3338,6 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`n
 Warnings:
 Note	1449	There is no 'no_such'@'user_1' registered
 ALTER ALGORITHM=MERGE VIEW v1 AS SELECT * FROM t1;
-Warnings:
-Note	1449	There is no 'no_such'@'user_1' registered
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=MERGE DEFINER=`no_such`@`user_1` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`i` AS `i` from `t1`

--- 1.134/mysql-test/r/create.result	2007-03-23 01:04:35 +04:00
+++ 1.135/mysql-test/r/create.result	2007-03-23 01:04:35 +04:00
@@ -455,21 +455,21 @@ create table t2 select ifnull(a,a), ifnu
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `ifnull(a,a)` tinyint(4) default NULL,
-  `ifnull(b,b)` smallint(6) default NULL,
-  `ifnull(c,c)` mediumint(8) default NULL,
-  `ifnull(d,d)` int(11) default NULL,
-  `ifnull(e,e)` bigint(20) default NULL,
-  `ifnull(f,f)` float(3,2) default NULL,
-  `ifnull(g,g)` double(4,3) default NULL,
-  `ifnull(h,h)` decimal(5,4) default NULL,
-  `ifnull(i,i)` year(4) default NULL,
-  `ifnull(j,j)` date default NULL,
-  `ifnull(k,k)` timestamp NOT NULL default '0000-00-00 00:00:00',
-  `ifnull(l,l)` datetime default NULL,
-  `ifnull(m,m)` varchar(1) default NULL,
-  `ifnull(n,n)` varchar(3) default NULL,
-  `ifnull(o,o)` varchar(10) default NULL
+  `ifnull(a,a)` tinyint(4) DEFAULT NULL,
+  `ifnull(b,b)` smallint(6) DEFAULT NULL,
+  `ifnull(c,c)` mediumint(8) DEFAULT NULL,
+  `ifnull(d,d)` int(11) DEFAULT NULL,
+  `ifnull(e,e)` bigint(20) DEFAULT NULL,
+  `ifnull(f,f)` float(3,2) DEFAULT NULL,
+  `ifnull(g,g)` double(4,3) DEFAULT NULL,
+  `ifnull(h,h)` decimal(5,4) DEFAULT NULL,
+  `ifnull(i,i)` year(4) DEFAULT NULL,
+  `ifnull(j,j)` date DEFAULT NULL,
+  `ifnull(k,k)` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `ifnull(l,l)` datetime DEFAULT NULL,
+  `ifnull(m,m)` varchar(1) DEFAULT NULL,
+  `ifnull(n,n)` varchar(3) DEFAULT NULL,
+  `ifnull(o,o)` varchar(10) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1,t2;
 create table t1(str varchar(10) default 'def',strnull varchar(10),intg int default '10',rel double default '3.14');

--- 1.53/mysql-test/r/type_float.result	2007-03-23 01:04:35 +04:00
+++ 1.54/mysql-test/r/type_float.result	2007-03-23 01:04:35 +04:00
@@ -91,10 +91,10 @@ col1	col2	col3	col4
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `col1` double default NULL,
-  `col2` double(22,5) default NULL,
-  `col3` double default NULL,
-  `col4` double default NULL
+  `col1` double DEFAULT NULL,
+  `col2` double(22,5) DEFAULT NULL,
+  `col3` double DEFAULT NULL,
+  `col4` double DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1,t2;
 create table t1 (a float);
@@ -237,7 +237,7 @@ d
 show create table t3;
 Table	Create Table
 t3	CREATE TABLE `t3` (
-  `d` double default NULL
+  `d` double DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1, t2, t3;
 create table t1 select  105213674794682365.00 + 0.0 x;