bk commit into 5.1 tree (ingo:1.2248)

[ingo]

Below is the list of changes that have just been committed into a local
5.1 repository of mydev. When mydev 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.2248 06/07/06 15:38:47 ingo@stripped +2 -0
  After merge fixes.

  sql/time.cc
    1.63 06/07/06 15:38:41 ingo@stripped +3 -2
    After merge fix. Auto resolve failed because this piece
    of code was moved from another file to here.

  mysql-test/r/archive.result
    1.23 06/07/06 15:38:41 ingo@stripped +2 -0
    After merge fix. It might come from the fix for
    bug 1662 (ALTER TABLE LIKE ignores DATA/INDEX DIRECTPORY)

# 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:	ingo
# Host:	chilla.local
# Root:	/home/mydev/mysql-5.1-ateam

--- 1.62/sql/time.cc	2006-06-20 17:09:42 +02:00
+++ 1.63/sql/time.cc	2006-07-06 15:38:41 +02:00
@@ -749,6 +749,7 @@ void make_truncated_value_warning(THD *t
                ER_TRUNCATED_WRONG_VALUE, warn_buff);
 }
 
+/* Daynumber from year 0 to 9999-12-31 */
 #define MAX_DAY_NUMBER 3652424L
 
 bool date_add_interval(TIME *ltime, interval_type int_type, INTERVAL interval)
@@ -804,7 +805,7 @@ bool date_add_interval(TIME *ltime, inte
     ltime->hour=   (uint) (sec/3600);
     daynr= calc_daynr(ltime->year,ltime->month,1) + days;
     /* Day number from year 0 to 9999-12-31 */
-    if ((ulonglong) daynr >= MAX_DAY_NUMBER)
+    if ((ulonglong) daynr > MAX_DAY_NUMBER)
       goto invalid_date;
     get_date_from_daynr((long) daynr, &ltime->year, &ltime->month,
                         &ltime->day);
@@ -815,7 +816,7 @@ bool date_add_interval(TIME *ltime, inte
     period= (calc_daynr(ltime->year,ltime->month,ltime->day) +
              sign * (long) interval.day);
     /* Daynumber from year 0 to 9999-12-31 */
-    if ((ulong) period >= MAX_DAY_NUMBER)
+    if ((ulong) period > MAX_DAY_NUMBER)
       goto invalid_date;
     get_date_from_daynr((long) period,&ltime->year,&ltime->month,&ltime->day);
     break;

--- 1.22/mysql-test/r/archive.result	2006-06-18 12:20:26 +02:00
+++ 1.23/mysql-test/r/archive.result	2006-07-06 15:38:41 +02:00
@@ -13812,6 +13812,8 @@ select * from t1 where i between 2 and 4
 i	v
 4	3r4f
 alter table t1 data directory="$MYSQLTEST_VARDIR/tmp";
+Warnings:
+Warning	0	DATA DIRECTORY option ignored
 select * from t1;
 i	v
 1	def