10.0-base merge

1 files changed, 7 insertions, 5 deletions

diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 2be7c00b4a4..fdc7ac98468 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -3201,7 +3201,9 @@ static void fetch_string_with_conversion(MYSQL_BIND *param, char *value,
   case MYSQL_TYPE_TIME:
   {
     MYSQL_TIME *tm= (MYSQL_TIME *)buffer;
-    str_to_time(value, length, tm, TIME_FUZZY_DATE, &err);
+    MYSQL_TIME_STATUS status;
+    str_to_time(value, length, tm, 0, &status);
+    err= status.warnings;
     *param->error= test(err);
     break;
   }
@@ -3210,7 +3212,9 @@ 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, TIME_FUZZY_DATE, &err);
+    MYSQL_TIME_STATUS status;
+    (void) str_to_datetime(value, length, tm, 0, &status);
+    err= status.warnings;
     *param->error= test(err) && (param->buffer_type == MYSQL_TYPE_DATE &&
                                  tm->time_type != MYSQL_TIMESTAMP_DATE);
     break;
@@ -3333,9 +3337,7 @@ static void fetch_long_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field,
   case MYSQL_TYPE_DATETIME:
   {
     int error;
-    value= number_to_datetime(value, 0,
-                              (MYSQL_TIME *) buffer, TIME_FUZZY_DATE,
-                              &error);
+    value= number_to_datetime(value, 0, (MYSQL_TIME *) buffer, 0, &error);
     *param->error= test(error);
     break;
   }