Merge with 4.0.13

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BUILD/SETUP.sh:
  Auto merged
BitKeeper/deleted/.del-libmysql.def~29fc6d70335f1c4c:
  Auto merged
Makefile.am:
  Auto merged
acinclude.m4:
  Auto merged
BitKeeper/triggers/post-commit:
  Auto merged
Build-tools/Do-compile:
  Auto merged
VC++Files/libmysql/libmysql.dsp:
  Auto merged
VC++Files/mysql.dsw:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
include/config-win.h:
  Auto merged
include/my_base.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/violite.h:
  Auto merged
innobase/buf/buf0flu.c:
  Auto merged
innobase/buf/buf0lru.c:
  Auto merged
innobase/include/buf0buf.h:
  Auto merged
innobase/include/buf0lru.h:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/log/log0log.c:
  Auto merged
innobase/log/log0recv.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/trx/trx0sys.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/ut/ut0ut.c:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_key.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_range.c:
  Auto merged
myisam/mi_search.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/r/delete.result:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/innodb_handler.result:
  Auto merged
mysql-test/r/join.result:
  Auto merged
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/multi_update.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/ctype_latin1_de.test:
  Auto merged
mysql-test/t/delete.test:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/innodb_handler.test:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
mysql-test/t/key.test:
  Auto merged
mysql-test/t/multi_update.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/repair.test:
  Auto merged
mysql-test/t/select_safe.test:
  Auto merged
mysql-test/t/type_decimal.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_pthread.c:
  Auto merged
scripts/mysql_fix_privilege_tables.sh:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/ha_heap.h:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/init.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
sql/unireg.h:
  Auto merged
sql-bench/crash-me.sh:
  Auto merged
sql-bench/test-transactions.sh:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
tests/grant.res:
  Auto merged
sql/log_event.cc:
  Merge with 4.0.13
  Cleaned up comment syntax

1 files changed, 2 insertions, 141 deletions

diff --git a/sql/time.cc b/sql/time.cc
index 94f9cb2e5e8..eba664a690d 100644
--- a/sql/time.cc
+++ b/sql/time.cc
@@ -251,145 +251,6 @@ void get_date_from_daynr(long daynr,uint *ret_year,uint *ret_month,
   DBUG_VOID_RETURN;
 }
 
-/*	find date from string and put it in vektor
-	Input: pos = "YYMMDD" OR "YYYYMMDD" in any order or
-	"xxxxx YYxxxMMxxxDD xxxx" where xxx is anything exept
-	a number. Month or day mustn't exeed 2 digits, year may be 4 digits.
-*/
-
-
-#ifdef NOT_NEEDED
-
-void find_date(string pos,uint *vek,uint flag)
-{
-  uint length,value;
-  string start;
-  DBUG_ENTER("find_date");
-  DBUG_PRINT("enter",("pos: '%s'  flag: %d",pos,flag));
-
-  bzero((char*) vek,sizeof(int)*4);
-  while (*pos && !my_isdigit(my_charset_latin1,*pos))
-    pos++;
-  length=(uint) strlen(pos);
-  for (uint i=0 ; i< 3; i++)
-  {
-    start=pos; value=0;
-    while (my_isdigit(my_charset_latin1,pos[0]) &&
-	   ((pos-start) < 2 || ((pos-start) < 4 && length >= 8 &&
-				!(flag & 3))))
-    {
-      value=value*10 + (uint) (uchar) (*pos - '0');
-      pos++;
-    }
-    vek[flag & 3]=value; flag>>=2;
-    while (*pos && (my_ispunct(my_charset_latin1,*pos) || 
-                    my_isspace(my_charset_latin1,*pos)))
-      pos++;
-  }
-  DBUG_PRINT("exit",("year: %d  month: %d  day: %d",vek[0],vek[1],vek[2]));
-  DBUG_VOID_RETURN;
-} /* find_date */
-
-
-	/* Outputs YYMMDD if input year < 100 or YYYYMMDD else */
-
-static long calc_daynr_from_week(uint year,uint week,uint day)
-{
-  long daynr;
-  int weekday;
-
-  daynr=calc_daynr(year,1,1);
-  if ((weekday= calc_weekday(daynr,0)) >= 3)
-    daynr+= (7-weekday);
-  else
-    daynr-=weekday;
-
-  return (daynr+week*7+day-8);
-}
-
-void convert_week_to_date(string date,uint flag,uint *res_length)
-{
-  string format;
-  uint year,vek[4];
-
-  find_date(date,vek,(uint) (1*4+2*16));		/* YY-WW-DD */
-  year=vek[0];
-
-  get_date_from_daynr(calc_daynr_from_week(vek[0],vek[1],vek[2]),
-		      &vek[0],&vek[1],&vek[2]);
-  *res_length=8;
-  format="%04d%02d%02d";
-  if (year < 100)
-  {
-    vek[0]= vek[0]%100;
-    *res_length=6;
-    format="%02d%02d%02d";
-  }
-  sprintf(date,format,vek[flag & 3],vek[(flag >> 2) & 3],
-	  vek[(flag >> 4) & 3]);
-  return;
-}
-
-	/* returns YYWWDD or YYYYWWDD according to input year */
-	/* flag only reflects format of input date */
-
-void convert_date_to_week(string date,uint flag,uint *res_length)
-{
-  uint vek[4],weekday,days,year,week,day;
-  long daynr,first_daynr;
-  char buff[256],*format;
-
-  if (! date[0])
-  {
-    get_date(buff,0,0L);			/* Use current date */
-    find_date(buff+2,vek,(uint) (1*4+2*16));	/* YY-MM-DD */
-  }
-  else
-    find_date(date,vek,flag);
-
-  year= vek[0];
-  daynr=      calc_daynr(year,vek[1],vek[2]);
-  first_daynr=calc_daynr(year,1,1);
-
-	/* Caculate year and first daynr of year */
-  if (vek[1] == 1 && (weekday=calc_weekday(first_daynr,0)) >= 3 &&
-      vek[2] <= 7-weekday)
-  {
-    if (!year--)
-      year=99;
-    first_daynr=first_daynr-calc_days_in_year(year);
-  }
-  else if (vek[1] == 12 &&
-	   (weekday=calc_weekday(first_daynr+calc_days_in_year(year)),0) < 3 &&
-	   vek[2] > 31-weekday)
-  {
-    first_daynr=first_daynr+calc_days_in_year(year);
-    if (year++ == 99)
-      year=0;
-  }
-
-	/* Calulate daynr of first day of week 1 */
-  if ((weekday= calc_weekday(first_daynr,0)) >= 3)
-    first_daynr+= (7-weekday);
-  else
-    first_daynr-=weekday;
-
-  days=(int) (daynr-first_daynr);
-  week=days/7+1 ; day=calc_weekday(daynr,0)+1;
-
-  *res_length=8;
-  format="%04d%02d%02d";
-  if (year < 100)
-  {
-    *res_length=6;
-    format="%02d%02d%02d";
-  }
-  sprintf(date,format,year,week,day);
-  return;
-}
-
-#endif
-
 	/* Functions to handle periods */
 
 ulong convert_period_to_month(ulong period)
@@ -516,14 +377,14 @@ str_to_TIME(const char *str, uint length, TIME *l_time,bool fuzzy_date)
   else
     date[6]=0;
 
-  if (year_length == 2)
+  if (year_length == 2 && i >=2 && (date[1] || date[2]))
     date[0]+= (date[0] < YY_PART_YEAR ? 2000 : 1900);
   number_of_fields=i;
   while (i < 6)
     date[i++]=0;
   if (number_of_fields < 3 || date[1] > 12 ||
       date[2] > 31 || date[3] > 23 || date[4] > 59 || date[5] > 59 ||
-      !fuzzy_date && (date[1] == 0 || date[2] == 0))
+      (!fuzzy_date && (date[1] == 0 || date[2] == 0)))
   {
     /* Only give warning for a zero date if there is some garbage after */
     if (!not_zero_date)				// If zero date