bk commit into 5.1 tree (df:1.2368)

[Daniel Fischer]

Below is the list of changes that have just been committed into a local
5.1 repository of df. When df 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-12-01 10:20:23+01:00, df@stripped +2 -0
  Merge dfischer@stripped:/home/bk/mysql-5.1-marvel
  into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
  MERGE: 1.2365.1.1

  Makefile.am@stripped, 2006-12-01 10:20:18+01:00, df@stripped +0 -0
    Auto merged
    MERGE: 1.105.1.1

  sql-common/my_time.c@stripped, 2006-12-01 10:20:18+01:00, df@stripped +0 -0
    Auto merged
    MERGE: 1.31.1.5

# 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:	df
# Host:	kahlann.erinye.com
# Root:	/home/df/mysql/build/mysql-5.1-build/RESYNC

--- 1.108/Makefile.am	2006-11-29 20:25:17 +01:00
+++ 1.109/Makefile.am	2006-12-01 10:20:18 +01:00
@@ -27,7 +27,7 @@ SUBDIRS =		. include @docs_dirs@ @zlib_d
 			@sql_union_dirs@ unittest storage plugin \
 			@sql_server@ scripts @man_dirs@ tests \
 			netware @libmysqld_dirs@ \
-			mysql-test support-files @tools_dirs@ \
+			mysql-test support-files sql-bench @tools_dirs@ \
 			win
 
 DIST_SUBDIRS =		$(SUBDIRS) BUILD

--- 1.33/sql-common/my_time.c	2006-11-29 18:47:32 +01:00
+++ 1.34/sql-common/my_time.c	2006-12-01 10:20:18 +01:00
@@ -429,7 +429,7 @@ str_to_datetime(const char *str, uint le
     goto err;
   }
 
-  if ((my_bool)check_date(l_time, not_zero_date, flags, was_cut))
+  if (check_date(l_time, not_zero_date != 0, flags, was_cut))
     goto err;
 
   l_time->time_type= (number_of_fields <= 3 ?
@@ -530,15 +530,15 @@ my_bool str_to_time(const char *str, uin
   if ((uint) (end-str) > 1 && str != end_of_days &&
       my_isdigit(&my_charset_latin1, *str))
   {                                             /* Found days part */
-    date[0]= value;
+    date[0]= (ulong) value;
     state= 1;                                   /* Assume next is hours */
     found_days= 1;
   }
   else if ((end-str) > 1 &&  *str == time_separator &&
            my_isdigit(&my_charset_latin1, str[1]))
   {
-    date[0]=0;                                  /* Assume we found hours */
-    date[1]=value;
+    date[0]= 0;                                 /* Assume we found hours */
+    date[1]= (ulong) value;
     state=2;
     found_hours=1;
     str++;                                      /* skip ':' */
@@ -547,9 +547,9 @@ my_bool str_to_time(const char *str, uin
   {
     /* String given as one number; assume HHMMSS format */
     date[0]= 0;
-    date[1]= value/10000;
-    date[2]= value/100 % 100;
-    date[3]= value % 100;
+    date[1]= (ulong) (value/10000);
+    date[2]= (ulong) (value/100 % 100);
+    date[3]= (ulong) (value % 100);
     state=4;
     goto fractional;
   }
@@ -559,7 +559,7 @@ my_bool str_to_time(const char *str, uin
   {
     for (value=0; str != end && my_isdigit(&my_charset_latin1,*str) ; str++)
       value=value*10L + (long) (*str - '0');
-    date[state++]=value;
+    date[state++]= (ulong) value;
     if (state == 4 || (end-str) < 2 || *str != time_separator ||
         !my_isdigit(&my_charset_latin1,str[1]))
       break;
@@ -594,7 +594,7 @@ fractional:
       value*= (long) log_10_int[field_length];
     else if (field_length < 0)
       *warning|= MYSQL_TIME_WARN_TRUNCATED;
-    date[4]=value;
+    date[4]= (ulong) value;
   }
   else
     date[4]=0;