Commit c13142f5 authored by unknown's avatar unknown
Browse files

Merge bk@192.168.21.1:mysql-5.0-opt 

into  mysql.com:/home/hf/work/8663/my50-8663


mysql-test/r/gis-rtree.result:
  Auto merged
parents 9f75d43e 030d080d

include/my_time.h

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ typedef long my_time_t; 
#define TIME_NO_ZERO_DATE	(TIME_NO_ZERO_IN_DATE*2)

#define TIME_INVALID_DATES	(TIME_NO_ZERO_DATE*2)



my_bool check_date(const MYSQL_TIME *ltime, my_bool not_zero_date,

                   ulong flags, int *was_cut);

enum enum_mysql_timestamp_type

str_to_datetime(const char *str, uint length, MYSQL_TIME *l_time,

                uint flags, int *was_cut);

sql-common/my_time.c

+2 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ uint calc_days_in_year(uint year) 
    1  error

*/



static my_bool check_date(const MYSQL_TIME *ltime, my_bool not_zero_date,

my_bool check_date(const MYSQL_TIME *ltime, my_bool not_zero_date,

                   ulong flags, int *was_cut)

{

  if (not_zero_date)

sql/field.cc

+28 −0
Original line number Diff line number Diff line
@@ -5407,7 +5407,21 @@ int Field_newdate::store_time(TIME *ltime,timestamp_type type) 
  long tmp;

  int error= 0;

  if (type == MYSQL_TIMESTAMP_DATE || type == MYSQL_TIMESTAMP_DATETIME)

  {

    tmp=ltime->year*16*32+ltime->month*32+ltime->day;

    if ((my_bool)check_date(ltime, tmp,

                            (TIME_FUZZY_DATE |

                             (current_thd->variables.sql_mode &

                              (MODE_NO_ZERO_IN_DATE | MODE_NO_ZERO_DATE |

                               MODE_INVALID_DATES))), &error))

    {

      char buff[12];

      String str(buff, sizeof(buff), &my_charset_latin1);

      make_date((DATE_TIME_FORMAT *) 0, ltime, &str);

      set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED,

                           str.ptr(), str.length(), MYSQL_TIMESTAMP_DATE, 1);

    }

  }

  else

  {

    tmp=0;
@@ -5616,8 +5630,22 @@ int Field_datetime::store_time(TIME *ltime,timestamp_type type) 
    structure always fit into DATETIME range.

  */

  if (type == MYSQL_TIMESTAMP_DATE || type == MYSQL_TIMESTAMP_DATETIME)

  {

    tmp=((ltime->year*10000L+ltime->month*100+ltime->day)*LL(1000000)+

	 (ltime->hour*10000L+ltime->minute*100+ltime->second));

    if ((my_bool)check_date(ltime, tmp,

                            (TIME_FUZZY_DATE |

                             (current_thd->variables.sql_mode &

                              (MODE_NO_ZERO_IN_DATE | MODE_NO_ZERO_DATE |

                               MODE_INVALID_DATES))), &error))

    {

      char buff[12];

      String str(buff, sizeof(buff), &my_charset_latin1);

      make_datetime((DATE_TIME_FORMAT *) 0, ltime, &str);

      set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED,

                           str.ptr(), str.length(), MYSQL_TIMESTAMP_DATETIME,1);

    }

  }

  else

  {

    tmp=0;