bk commit into 5.0 tree (tsmith:1.2218)

[tim]

Below is the list of changes that have just been committed into a local
5.0 repository of tim. When tim 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, 2006-07-26 13:30:03-06:00, tsmith@stripped +3 -0
  Merge siva.hindu.god:/usr/home/tim/m/bk/global-41
  into  siva.hindu.god:/usr/home/tim/m/bk/global-50
  MERGE: 1.1616.2144.172

  mysql-test/r/func_time.result@stripped, 2006-07-26 13:29:58-06:00, tsmith@stripped +0 -0
    Auto merged
    MERGE: 1.23.1.17

  mysql-test/t/func_time.test@stripped, 2006-07-26 13:29:58-06:00, tsmith@stripped +0 -0
    Auto merged
    MERGE: 1.21.1.14

  sql/field.cc@stripped, 2006-07-26 13:29:58-06:00, tsmith@stripped +0 -0
    Auto merged
    MERGE: 1.197.1.34

# 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:	tsmith
# Host:	siva.hindu.god
# Root:	/usr/home/tim/m/bk/global-50/RESYNC

--- 1.316/sql/field.cc	2006-07-26 13:30:10 -06:00
+++ 1.317/sql/field.cc	2006-07-26 13:30:10 -06:00
@@ -4606,7 +4606,7 @@ String *Field_timestamp::val_str(String 
   thd->time_zone_used= 1;
 
   temp= time_tmp.year % 100;
-  if (temp < YY_PART_YEAR)
+  if (temp < YY_PART_YEAR - 1)
   {
     *to++= '2';
     *to++= '0';

--- 1.61/mysql-test/r/func_time.result	2006-07-26 13:30:10 -06:00
+++ 1.62/mysql-test/r/func_time.result	2006-07-26 13:30:10 -06:00
@@ -758,6 +758,13 @@ select monthname(str_to_date(null, '%m')
 monthname(str_to_date(1, '%m')), monthname(str_to_date(0, '%m'));
 monthname(str_to_date(null, '%m'))	monthname(str_to_date(null, '%m'))	monthname(str_to_date(1, '%m'))	monthname(str_to_date(0, '%m'))
 NULL	NULL	January	NULL
+set time_zone='-6:00';
+create table t1(a timestamp);
+insert into t1 values (19691231190001);
+select * from t1;
+a
[phone]:00:01
+drop table t1;
 create table t1(f1 date, f2 time, f3 datetime);
 insert into t1 values ("2006-01-01", "12:01:01", "2006-01-01 12:01:01");
 insert into t1 values ("2006-01-02", "12:01:02", "2006-01-02 12:01:02");

--- 1.49/mysql-test/t/func_time.test	2006-07-26 13:30:11 -06:00
+++ 1.50/mysql-test/t/func_time.test	2006-07-26 13:30:11 -06:00
@@ -376,6 +376,16 @@ select monthname(str_to_date(null, '%m')
        monthname(str_to_date(1, '%m')), monthname(str_to_date(0, '%m'));
 
 #
+# Bug #16327: problem with timestamp < 1970
+#
+
+set time_zone='-6:00';
+create table t1(a timestamp);
+insert into t1 values (19691231190001);
+select * from t1;
+drop table t1;
+
+#
 # Bug#16377 result of DATE/TIME functions were compared as strings which
 #           can lead to a wrong result.
 #