bk commit into 5.0 tree (ramil:1.2196)

[ramil]

Below is the list of changes that have just been committed into a local
5.0 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
  1.2196 06/06/21 09:16:22 ramil@stripped +6 -0
  Merge mysql.com:/usr/home/ram/work/mysql-4.1
  into  mysql.com:/usr/home/ram/work/mysql-5.0

  mysql-test/r/func_time.result
    1.55 06/06/21 09:16:16 ramil@stripped +0 -0
    SCCS merged

  sql/item_strfunc.h
    1.108 06/06/21 08:49:28 ramil@stripped +0 -0
    Auto merged

  sql/item_strfunc.cc
    1.270 06/06/21 08:49:28 ramil@stripped +0 -0
    Auto merged

  mysql-test/t/func_time.test
    1.45 06/06/21 08:49:27 ramil@stripped +0 -0
    Auto merged

  mysql-test/t/func_str.test
    1.89 06/06/21 08:49:27 ramil@stripped +0 -0
    Auto merged

  mysql-test/r/func_str.result
    1.115 06/06/21 08:49:27 ramil@stripped +0 -0
    Auto merged

# 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:	myoffice.izhnet.ru
# Root:	/usr/home/ram/work/mysql-5.0/RESYNC

--- 1.54/mysql-test/r/func_time.result	2006-06-20 16:35:27 +05:00
+++ 1.55/mysql-test/r/func_time.result	2006-06-21 09:16:16 +05:00
@@ -794,10 +794,17 @@ select f1 from t1 where makedate(2006,2)
 f1
 2006-01-02
 drop table t1;
-select now() - now() + 0, curtime() - curtime() + 0, 
+create table t1 select now() - now(), curtime() - curtime(), 
 sec_to_time(1) + 0, from_unixtime(1) + 0;
-now() - now() + 0	curtime() - curtime() + 0	sec_to_time(1) + 0	from_unixtime(1) + 0
-0.000000	0.000000	1.000000	19700101030001.000000
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `now() - now()` double(23,6) NOT NULL default '0.000000',
+  `curtime() - curtime()` double(23,6) NOT NULL default '0.000000',
+  `sec_to_time(1) + 0` double(23,6) default NULL,
+  `from_unixtime(1) + 0` double(23,6) default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+drop table t1;
 explain extended select timestampdiff(SQL_TSI_WEEK, '2001-02-01', '2001-05-01') as a1,
 timestampdiff(SQL_TSI_FRAC_SECOND, '2001-02-01 12:59:59.120000', '2001-05-01 12:58:58.119999') as a2;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

--- 1.44/mysql-test/t/func_time.test	2006-06-17 03:52:46 +05:00
+++ 1.45/mysql-test/t/func_time.test	2006-06-21 08:49:27 +05:00
@@ -392,8 +392,10 @@ drop table t1;
 # Bug #16546
 # 
 
-select now() - now() + 0, curtime() - curtime() + 0, 
-       sec_to_time(1) + 0, from_unixtime(1) + 0;
+create table t1 select now() - now(), curtime() - curtime(), 
+                       sec_to_time(1) + 0, from_unixtime(1) + 0;
+show create table t1;
+drop table t1;
 
 # End of 4.1 tests