bk commit into 5.1 tree (elliot:1.2217)

[Elliot Murphy]

Below is the list of changes that have just been committed into a local
5.1 repository of emurphy. When emurphy 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.2217 06/06/25 16:04:11 elliot@stripped +2 -0
  Post merge fix

  mysql-test/r/select.result
    1.132 06/06/25 16:04:08 elliot@stripped +6 -0
    post-merge fix

  mysql-test/r/func_time.result
    1.58 06/06/25 16:04:08 elliot@stripped +10 -3
    post-merge fix

# 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:	elliot
# Host:	scared.(none)
# Root:	/home/emurphy/src/bk-clean/mysql-5.1

--- 1.57/mysql-test/r/func_time.result	2006-06-25 09:59:29 -04:00
+++ 1.58/mysql-test/r/func_time.result	2006-06-25 16:04:08 -04: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;
 End of 4.1 tests
 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;

--- 1.131/mysql-test/r/select.result	2006-06-25 09:59:29 -04:00
+++ 1.132/mysql-test/r/select.result	2006-06-25 16:04:08 -04:00
@@ -2730,6 +2730,12 @@ ERROR 42000: Key 'a' doesn't exist in ta
 EXPLAIN SELECT * FROM t1 FORCE INDEX (a);
 ERROR 42000: Key 'a' doesn't exist in table 't1'
 DROP TABLE t1;
+CREATE TABLE t1 (i BIGINT UNSIGNED NOT NULL);
+INSERT INTO t1 VALUES (10);
+SELECT i='1e+01',i=1e+01, i in (1e+01,1e+01), i in ('1e+01','1e+01') FROM t1;
+i='1e+01'	i=1e+01	i in (1e+01,1e+01)	i in ('1e+01','1e+01')
+0	1	1	1
+DROP TABLE t1;
 CREATE TABLE t1 ( 
 K2C4 varchar(4) character set latin1 collate latin1_bin NOT NULL default '', 
 K4N4 varchar(4) character set latin1 collate latin1_bin NOT NULL default '0000',