bk commit into 4.0 tree (monty:1.1660)

[monty]

Below is the list of changes that have just been committed into a local
4.0 repository of monty. When monty 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1660 03/12/16 14:40:57 monty@stripped +2 -0
  Fixes for last pull

  sql/field.cc
    1.81 03/12/16 14:40:55 monty@stripped +1 -1
    Safer timestamp year checking (as 1969 can be in timestamp)

  libmysqld/lib_sql.cc
    1.46 03/12/16 14:40:55 monty@stripped +6 -0
    Fixed compilation error in embedded library (from last pull)

# 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:	monty
# Host:	narttu.mysql.fi
# Root:	/my/mysql-4.0

--- 1.80/sql/field.cc	Sat Dec 13 15:41:15 2003
+++ 1.81/sql/field.cc	Tue Dec 16 14:40:55 2003
@@ -2589,7 +2589,7 @@
   {
     long not_used;
     
-    if (l_time.year >= TIMESTAMP_MAX_YEAR || l_time.year < 1900+YY_PART_YEAR)
+    if (l_time.year >= TIMESTAMP_MAX_YEAR || l_time.year < 1900+YY_PART_YEAR-1)
     {
       current_thd->cuted_fields++;
       timestamp=0;

--- 1.45/libmysqld/lib_sql.cc	Fri Dec 12 16:27:24 2003
+++ 1.46/libmysqld/lib_sql.cc	Tue Dec 16 14:40:55 2003
@@ -277,6 +277,12 @@
 }
 
 
+void THD::clear_error()
+{
+  net.last_error[0]= 0;
+  net.last_errno= 0;
+}
+
 /*
   Make a copy of array and the strings array points to
 */