Commit baad44b9 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-5.0-5906 

into  mysql.com:/home/jimw/my/mysql-5.0-clean


libmysql/libmysql.c:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
sql/field.cc:
  Auto merged
mysql-test/r/strict.result:
  Resolve conflict
mysql-test/t/strict.test:
  Resolve conflict
parents 8e845dba 5958f22a

include/my_time.h

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ enum enum_mysql_timestamp_type 
str_to_datetime(const char *str, uint length, MYSQL_TIME *l_time,

                uint flags, int *was_cut);

longlong number_to_datetime(longlong nr, MYSQL_TIME *time_res,

                               my_bool fuzzy_date, int *was_cut);

                            uint flags, int *was_cut);

ulonglong TIME_to_ulonglong_datetime(const MYSQL_TIME *time);

ulonglong TIME_to_ulonglong_date(const MYSQL_TIME *time);

ulonglong TIME_to_ulonglong_time(const MYSQL_TIME *time);

libmysql/libmysql.c

+3 −2
Original line number Diff line number Diff line
@@ -3585,7 +3585,7 @@ static void fetch_string_with_conversion(MYSQL_BIND *param, char *value, 
  case MYSQL_TYPE_TIMESTAMP:

  {

    MYSQL_TIME *tm= (MYSQL_TIME *)buffer;

    (void) str_to_datetime(value, length, tm, 0, &err);

    (void) str_to_datetime(value, length, tm, TIME_FUZZY_DATE, &err);

    *param->error= test(err) && (param->buffer_type == MYSQL_TYPE_DATE &&

                                 tm->time_type != MYSQL_TIMESTAMP_DATE);

    break;
@@ -3703,7 +3703,8 @@ static void fetch_long_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field, 
  case MYSQL_TYPE_DATETIME:

  {

    int error;

    value= number_to_datetime(value, (MYSQL_TIME *) buffer, 1, &error);

    value= number_to_datetime(value, (MYSQL_TIME *) buffer, TIME_FUZZY_DATE,

                              &error);

    *param->error= test(error);

    break;

  }

mysql-test/r/ps_2myisam.result

+4 −4
Original line number Diff line number Diff line
@@ -2976,25 +2976,25 @@ Warnings: 
Warning	1265	Data truncated for column 'c17' at row 1

Warnings:

Warning	1264	Out of range value adjusted for column 'c13' at row 1

Warning	1265	Data truncated for column 'c14' at row 1

Warning	1264	Out of range value adjusted for column 'c14' at row 1

Warning	1265	Data truncated for column 'c15' at row 1

Warning	1264	Out of range value adjusted for column 'c16' at row 1

Warning	1264	Out of range value adjusted for column 'c17' at row 1

Warnings:

Warning	1264	Out of range value adjusted for column 'c13' at row 1

Warning	1265	Data truncated for column 'c14' at row 1

Warning	1264	Out of range value adjusted for column 'c14' at row 1

Warning	1265	Data truncated for column 'c15' at row 1

Warning	1264	Out of range value adjusted for column 'c16' at row 1

Warning	1264	Out of range value adjusted for column 'c17' at row 1

Warnings:

Warning	1264	Out of range value adjusted for column 'c13' at row 1

Warning	1265	Data truncated for column 'c14' at row 1

Warning	1264	Out of range value adjusted for column 'c14' at row 1

Warning	1265	Data truncated for column 'c15' at row 1

Warning	1264	Out of range value adjusted for column 'c16' at row 1

Warning	1264	Out of range value adjusted for column 'c17' at row 1

Warnings:

Warning	1264	Out of range value adjusted for column 'c13' at row 1

Warning	1265	Data truncated for column 'c14' at row 1

Warning	1264	Out of range value adjusted for column 'c14' at row 1

Warning	1265	Data truncated for column 'c15' at row 1

Warning	1264	Out of range value adjusted for column 'c16' at row 1

Warning	1264	Out of range value adjusted for column 'c17' at row 1

mysql-test/r/ps_3innodb.result

+4 −4
Original line number Diff line number Diff line
@@ -2959,25 +2959,25 @@ Warnings: 
Warning	1265	Data truncated for column 'c17' at row 1

Warnings:

Warning	1264	Out of range value adjusted for column 'c13' at row 1

Warning	1265	Data truncated for column 'c14' at row 1

Warning	1264	Out of range value adjusted for column 'c14' at row 1

Warning	1265	Data truncated for column 'c15' at row 1

Warning	1264	Out of range value adjusted for column 'c16' at row 1

Warning	1264	Out of range value adjusted for column 'c17' at row 1

Warnings:

Warning	1264	Out of range value adjusted for column 'c13' at row 1

Warning	1265	Data truncated for column 'c14' at row 1

Warning	1264	Out of range value adjusted for column 'c14' at row 1

Warning	1265	Data truncated for column 'c15' at row 1

Warning	1264	Out of range value adjusted for column 'c16' at row 1

Warning	1264	Out of range value adjusted for column 'c17' at row 1

Warnings:

Warning	1264	Out of range value adjusted for column 'c13' at row 1

Warning	1265	Data truncated for column 'c14' at row 1

Warning	1264	Out of range value adjusted for column 'c14' at row 1

Warning	1265	Data truncated for column 'c15' at row 1

Warning	1264	Out of range value adjusted for column 'c16' at row 1

Warning	1264	Out of range value adjusted for column 'c17' at row 1

Warnings:

Warning	1264	Out of range value adjusted for column 'c13' at row 1

Warning	1265	Data truncated for column 'c14' at row 1

Warning	1264	Out of range value adjusted for column 'c14' at row 1

Warning	1265	Data truncated for column 'c15' at row 1

Warning	1264	Out of range value adjusted for column 'c16' at row 1

Warning	1264	Out of range value adjusted for column 'c17' at row 1

mysql-test/r/ps_4heap.result

+4 −4
Original line number Diff line number Diff line
@@ -2960,25 +2960,25 @@ Warnings: 
Warning	1265	Data truncated for column 'c17' at row 1

Warnings:

Warning	1264	Out of range value adjusted for column 'c13' at row 1

Warning	1265	Data truncated for column 'c14' at row 1

Warning	1264	Out of range value adjusted for column 'c14' at row 1

Warning	1265	Data truncated for column 'c15' at row 1

Warning	1264	Out of range value adjusted for column 'c16' at row 1

Warning	1264	Out of range value adjusted for column 'c17' at row 1

Warnings:

Warning	1264	Out of range value adjusted for column 'c13' at row 1

Warning	1265	Data truncated for column 'c14' at row 1

Warning	1264	Out of range value adjusted for column 'c14' at row 1

Warning	1265	Data truncated for column 'c15' at row 1

Warning	1264	Out of range value adjusted for column 'c16' at row 1

Warning	1264	Out of range value adjusted for column 'c17' at row 1

Warnings:

Warning	1264	Out of range value adjusted for column 'c13' at row 1

Warning	1265	Data truncated for column 'c14' at row 1

Warning	1264	Out of range value adjusted for column 'c14' at row 1

Warning	1265	Data truncated for column 'c15' at row 1

Warning	1264	Out of range value adjusted for column 'c16' at row 1

Warning	1264	Out of range value adjusted for column 'c17' at row 1

Warnings:

Warning	1264	Out of range value adjusted for column 'c13' at row 1

Warning	1265	Data truncated for column 'c14' at row 1

Warning	1264	Out of range value adjusted for column 'c14' at row 1

Warning	1265	Data truncated for column 'c15' at row 1

Warning	1264	Out of range value adjusted for column 'c16' at row 1

Warning	1264	Out of range value adjusted for column 'c17' at row 1