MDEV-17712 Remove C_TIME_FUZZY_DATES, C_TIME_DATETIME_ONLY, C_TIME_TIME_ONLY

11 files changed, 141 insertions, 90 deletions

diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index 1b6c94aaf6d..c111730dd2a 100644
--- a/client/mysqlbinlog.cc
+++ b/client/mysqlbinlog.cc
@@ -1893,7 +1893,7 @@ static my_time_t convert_str_to_timestamp(const char* str)
   uint dummy_in_dst_time_gap;
   
   /* We require a total specification (date AND time) */
-  if (str_to_datetime(str, (uint) strlen(str), &l_time, 0, &status) ||
+  if (str_to_datetime_or_date(str, (uint) strlen(str), &l_time, 0, &status) ||
       l_time.time_type != MYSQL_TIMESTAMP_DATETIME || status.warnings)
   {
     error("Incorrect date and time argument: %s", str);
diff --git a/include/my_time.h b/include/my_time.h
index babd6101eeb..a7911f0f8da 100644
--- a/include/my_time.h
+++ b/include/my_time.h
@@ -57,13 +57,6 @@ extern uchar days_in_month[];
 
 /* Flags to str_to_datetime */
 
-/*
-  TIME_FUZZY_DATES is used for the result will only be used for comparison
-  purposes. Conversion is as relaxed as possible.
-*/
-#define C_TIME_FUZZY_DATES      1U
-#define C_TIME_DATETIME_ONLY    2U
-#define C_TIME_TIME_ONLY        4U
 #define C_TIME_NO_ZERO_IN_DATE  (1UL << 23) /* == MODE_NO_ZERO_IN_DATE */
 #define C_TIME_NO_ZERO_DATE     (1UL << 24) /* == MODE_NO_ZERO_DATE    */
 #define C_TIME_INVALID_DATES    (1UL << 25) /* == MODE_INVALID_DATES   */
@@ -117,15 +110,18 @@ my_bool check_date(const MYSQL_TIME *ltime, my_bool not_zero_date,
                    ulonglong flags, int *was_cut);
 my_bool str_to_DDhhmmssff(const char *str, size_t length, MYSQL_TIME *l_time,
                           ulong max_hour, MYSQL_TIME_STATUS *status);
-my_bool str_to_time(const char *str, size_t length, MYSQL_TIME *l_time, 
-                    ulonglong flag, MYSQL_TIME_STATUS *status);
-my_bool str_to_datetime(const char *str, size_t length, MYSQL_TIME *l_time,
-                        ulonglong flags, MYSQL_TIME_STATUS *status);
-longlong number_to_datetime(longlong nr, ulong sec_part, MYSQL_TIME *time_res,
-                            ulonglong flags, int *was_cut);
-
-int number_to_time(my_bool neg, ulonglong nr, ulong sec_part,
-                   MYSQL_TIME *ltime, int *was_cut);
+my_bool str_to_datetime_or_date_or_time(const char *str, size_t length,
+                                        MYSQL_TIME *to, ulonglong flag,
+                                        MYSQL_TIME_STATUS *status);
+my_bool str_to_datetime_or_date(const char *str, size_t length, MYSQL_TIME *to,
+                                ulonglong flags, MYSQL_TIME_STATUS *status);
+
+longlong number_to_datetime_or_date(longlong nr, ulong sec_part,
+                                    MYSQL_TIME *time_res,
+                                    ulonglong flags, int *was_cut);
+int number_to_time_only(my_bool neg, ulonglong nr, ulong sec_part,
+                        MYSQL_TIME *ltime, int *was_cut);
+
 ulonglong TIME_to_ulonglong_datetime(const MYSQL_TIME *);
 ulonglong TIME_to_ulonglong_date(const MYSQL_TIME *);
 ulonglong TIME_to_ulonglong_time(const MYSQL_TIME *);
diff --git a/libmysqld/libmysql.c b/libmysqld/libmysql.c
index b3ef96698ff..98dc9f17f60 100644
--- a/libmysqld/libmysql.c
+++ b/libmysqld/libmysql.c
@@ -3215,7 +3215,7 @@ static void fetch_string_with_conversion(MYSQL_BIND *param, char *value, size_t
   {
     MYSQL_TIME *tm= (MYSQL_TIME *)buffer;
     MYSQL_TIME_STATUS status;
-    str_to_time(value, length, tm, 0, &status);
+    str_to_datetime_or_date_or_time(value, length, tm, 0, &status);
     err= status.warnings;
     *param->error= MY_TEST(err);
     break;
@@ -3226,7 +3226,7 @@ static void fetch_string_with_conversion(MYSQL_BIND *param, char *value, size_t
   {
     MYSQL_TIME *tm= (MYSQL_TIME *)buffer;
     MYSQL_TIME_STATUS status;
-    (void) str_to_datetime(value, length, tm, 0, &status);
+    (void) str_to_datetime_or_date(value, length, tm, 0, &status);
     err= status.warnings;
     *param->error= MY_TEST(err) && (param->buffer_type == MYSQL_TYPE_DATE &&
                                     tm->time_type != MYSQL_TIMESTAMP_DATE);
@@ -3350,7 +3350,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, 0, &error);
+    value= number_to_datetime_or_date(value, 0, (MYSQL_TIME *) buffer, 0, &error);
     *param->error= MY_TEST(error);
     break;
   }
diff --git a/sql-common/my_time.c b/sql-common/my_time.c
index 249ed48713a..e2f1b8c4e1c 100644
--- a/sql-common/my_time.c
+++ b/sql-common/my_time.c
@@ -63,9 +63,7 @@ uint calc_days_in_year(uint year)
 
 static const ulonglong C_KNOWN_FLAGS= C_TIME_NO_ZERO_IN_DATE |
                                       C_TIME_NO_ZERO_DATE    |
-                                      C_TIME_INVALID_DATES   |
-                                      C_TIME_TIME_ONLY       |
-                                      C_TIME_DATETIME_ONLY;
+                                      C_TIME_INVALID_DATES;
 
 #define C_FLAGS_OK(flags)             (((flags) & ~C_KNOWN_FLAGS) == 0)
 
@@ -161,7 +159,8 @@ static int get_punct(const char **str, const char *end)
   return 1;
 }
 
-static int get_date_time_separator(uint *number_of_fields, ulonglong flags,
+static int get_date_time_separator(uint *number_of_fields,
+                                   my_bool punct_is_date_time_separator,
                                    const char **str, const char *end)
 {
   const char *s= *str;
@@ -180,11 +179,11 @@ static int get_date_time_separator(uint *number_of_fields, ulonglong flags,
     but
     cast("11:11:11.12.12.12" as time) should give 11:11:11.12
     that is, a punctuation character can be accepted as a date/time separator
-    only if TIME_DATETIME_ONLY (see str_to_time) is not set.
+    only if "punct_is_date_time_separator" is set.
   */
   if (my_ispunct(&my_charset_latin1, *s))
   {
-    if (flags & C_TIME_DATETIME_ONLY)
+    if (!punct_is_date_time_separator)
     {
       /* see above, returning 1 is not enough, we need hard abort here */
       *number_of_fields= 0;
@@ -414,6 +413,9 @@ str_to_DDhhmmssff_internal(my_bool neg, const char *str, size_t length,
                         TIME_NO_ZERO_IN_DATE	Don't allow partial dates
                         TIME_NO_ZERO_DATE	Don't allow 0000-00-00 date
                         TIME_INVALID_DATES	Allow 2000-02-31
+    punct_is_date_time_separator
+                        Allow punctuation as a date/time separator,
+                        or return a hard error.
     status              Conversion status
 
 
@@ -448,7 +450,9 @@ str_to_DDhhmmssff_internal(my_bool neg, const char *str, size_t length,
 
 static my_bool
 str_to_datetime_or_date_body(const char *str, size_t length, MYSQL_TIME *l_time,
-                             ulonglong flags, MYSQL_TIME_STATUS *status)
+                             ulonglong flags,
+                             my_bool punct_is_date_time_separator,
+                             MYSQL_TIME_STATUS *status)
 {
   const char *end=str+length, *pos;
   uint number_of_fields= 0, digits, year_length, not_zero_date;
@@ -503,7 +507,8 @@ str_to_datetime_or_date_body(const char *str, size_t length, MYSQL_TIME *l_time,
          || get_number(&l_time->month, &number_of_fields, &str, end)
          || get_punct(&str, end)
          || get_number(&l_time->day, &number_of_fields, &str, end)
-         || get_date_time_separator(&number_of_fields, flags, &str, end)
+         || get_date_time_separator(&number_of_fields,
+                                    punct_is_date_time_separator, &str, end)
          || get_number(&l_time->hour, &number_of_fields, &str, end)
          || get_punct(&str, end)
          || get_number(&l_time->minute, &number_of_fields, &str, end)
@@ -587,6 +592,7 @@ err:
      TRUE  on error
 */
 
+static
 my_bool str_to_datetime_or_date_or_time_body(const char *str, size_t length,
                                              MYSQL_TIME *l_time,
                                              ulonglong fuzzydate,
@@ -599,9 +605,7 @@ my_bool str_to_datetime_or_date_or_time_body(const char *str, size_t length,
   if (is_datetime_body_candidate(str, length))
   {                                             /* Probably full timestamp */
     (void) str_to_datetime_or_date_body(str, length, l_time,
-                                        (fuzzydate & ~C_TIME_TIME_ONLY) |
-                                        C_TIME_DATETIME_ONLY,
-                                        status);
+                                        fuzzydate, FALSE, status);
     if (l_time->time_type >= MYSQL_TIMESTAMP_ERROR)
       return l_time->time_type == MYSQL_TIMESTAMP_ERROR;
     my_time_status_init(status);
@@ -616,6 +620,12 @@ my_bool str_to_datetime_or_date_or_time_body(const char *str, size_t length,
 }
 
 
+/*
+  Convert a string with INTERVAL DAY TO SECOND to MYSQL_TIME.
+  Input format: [-][DD ]hh:mm:ss.ffffff
+
+  If the input string appears to be a DATETIME, error is returned.
+*/
 my_bool str_to_DDhhmmssff(const char *str, size_t length, MYSQL_TIME *ltime,
                           ulong max_hour, MYSQL_TIME_STATUS *status)
 {
@@ -634,7 +644,7 @@ my_bool str_to_DDhhmmssff(const char *str, size_t length, MYSQL_TIME *ltime,
   if (is_datetime_body_candidate(str, length))
   {
     (void) str_to_datetime_or_date_body(str, length, ltime,
-                                        C_TIME_DATETIME_ONLY, status);
+                                        0, FALSE, status);
     if (ltime->time_type > MYSQL_TIMESTAMP_ERROR)
     {
       status->warnings|= MYSQL_TIME_WARN_TRUNCATED;
@@ -650,7 +660,7 @@ my_bool str_to_DDhhmmssff(const char *str, size_t length, MYSQL_TIME *ltime,
     will scan only '2001'.
   */
   if (str_to_DDhhmmssff_internal(neg, str, length, ltime, max_hour,
-                                 status, &endptr) ||                             
+                                 status, &endptr) ||
       (endptr < str + length && endptr[0] == '-'))
     return TRUE;
   status->warnings|= warn;
@@ -658,10 +668,13 @@ my_bool str_to_DDhhmmssff(const char *str, size_t length, MYSQL_TIME *ltime,
 }
 
 
-my_bool str_to_time(const char *str, size_t length, MYSQL_TIME *l_time,
-                    ulonglong fuzzydate, MYSQL_TIME_STATUS *status)
+my_bool
+str_to_datetime_or_date_or_time(const char *str, size_t length,
+                                MYSQL_TIME *l_time,
+                                ulonglong fuzzydate,
+                                MYSQL_TIME_STATUS *status)
 {
-  my_bool neg;
+  my_bool neg, rc;
   int warn;
   DBUG_ASSERT(C_FLAGS_OK(fuzzydate));
   my_time_status_init(status);
@@ -674,18 +687,23 @@ my_bool str_to_time(const char *str, size_t length, MYSQL_TIME *l_time,
     QQ: Perhaps we should modify xxx_body() to return endptr.
     If endptr points to '-', return an error.
   */
-  if (str_to_datetime_or_date_or_time_body(str, length, l_time,
-                                           fuzzydate, status))
-    return TRUE;
+  rc= str_to_datetime_or_date_or_time_body(str, length, l_time,
+                                           fuzzydate, status);
   status->warnings|= warn;
-  l_time->neg= neg;
+  if (rc)
+    return rc;
+  if ((l_time->neg= neg) && l_time->time_type != MYSQL_TIMESTAMP_TIME)
+  {
+    status->warnings|= MYSQL_TIME_WARN_OUT_OF_RANGE;
+    return TRUE;
+  }
   return FALSE;
 }
 
 
 my_bool
-str_to_datetime(const char *str, size_t length, MYSQL_TIME *l_time,
-                ulonglong flags, MYSQL_TIME_STATUS *status)
+str_to_datetime_or_date(const char *str, size_t length, MYSQL_TIME *l_time,
+                        ulonglong flags, MYSQL_TIME_STATUS *status)
 {
   my_bool neg, rc;
   int warn;
@@ -696,13 +714,11 @@ str_to_datetime(const char *str, size_t length, MYSQL_TIME *l_time,
     status->warnings= warn;
     return TRUE;
   }
-  rc= (flags & C_TIME_TIME_ONLY) ?
-    str_to_datetime_or_date_or_time_body(str, length, l_time, flags, status) :
-    str_to_datetime_or_date_body(str, length, l_time, flags, status);
+  rc= str_to_datetime_or_date_body(str, length, l_time, flags, TRUE, status);
   status->warnings|= warn;
   if (rc)
     return rc;
-  if ((l_time->neg= neg) && l_time->time_type != MYSQL_TIMESTAMP_TIME)
+  if ((l_time->neg= neg))
   {
     status->warnings|= MYSQL_TIME_WARN_OUT_OF_RANGE;
     return TRUE;
@@ -711,6 +727,27 @@ str_to_datetime(const char *str, size_t length, MYSQL_TIME *l_time,
 }
 
 
+
+/**
+  Convert a string to INTERVAL DAY TO SECOND.
+  Input format:  [DD ]hh:mm:ss.ffffff
+
+  Datetime or date formats are not understood.
+
+  Optional leading spaces and signs must be scanned by the caller.
+  "str" should point to the first digit.
+
+  @param      neg      - set the value to be negative
+  @param      str      - the input string
+  @param      length   - length of "str"
+  @param[OUT] l_time   - write the result here
+  @param      max_hour - if the result hour value appears to be greater than
+                         max_hour, then cut to result to 'max_hour:59:59.999999'
+  @param      err_hour - if the hour appears to be greater than err_hour,
+                         return an error (without cut)
+  @param      status
+  @param      endptr
+*/
 static my_bool
 str_to_DDhhmmssff_internal(my_bool neg, const char *str, size_t length,
                            MYSQL_TIME *l_time, ulong max_hour,
@@ -1428,7 +1465,7 @@ int my_timeval_to_str(const struct timeval *tm, char *to, uint dec)
   representation and form value of DATETIME type as side-effect.
 
   SYNOPSIS
-    number_to_datetime()
+    number_to_datetime_or_date()
       nr         - datetime value as number
       time_res   - pointer for structure for broken-down representation
       flags      - flags to use in validating date, as in str_to_datetime()
@@ -1449,8 +1486,9 @@ int my_timeval_to_str(const struct timeval *tm, char *to, uint dec)
     Datetime value in YYYYMMDDHHMMSS format.
 */
 
-longlong number_to_datetime(longlong nr, ulong sec_part, MYSQL_TIME *time_res,
-                            ulonglong flags, int *was_cut)
+longlong number_to_datetime_or_date(longlong nr, ulong sec_part,
+                                    MYSQL_TIME *time_res,
+                                    ulonglong flags, int *was_cut)
 {
   long part1,part2;
   DBUG_ASSERT(C_FLAGS_OK(flags));
@@ -1554,13 +1592,9 @@ longlong number_to_datetime(longlong nr, ulong sec_part, MYSQL_TIME *time_res,
     0        time value is valid, but was possibly truncated
     -1       time value is invalid
 */
-int number_to_time(my_bool neg, ulonglong nr, ulong sec_part,
-                   MYSQL_TIME *ltime, int *was_cut)
+int number_to_time_only(my_bool neg, ulonglong nr, ulong sec_part,
+                        MYSQL_TIME *ltime, int *was_cut)
 {
-  if (nr > 9999999 && nr <= 99991231235959ULL && neg == 0)
-    return number_to_datetime(nr, sec_part, ltime,
-                              C_TIME_INVALID_DATES, was_cut) < 0 ? -1 : 0;
-
   *was_cut= 0;
   ltime->year= ltime->month= ltime->day= 0;
   ltime->time_type= MYSQL_TIMESTAMP_TIME;
diff --git a/sql/sql_basic_types.h b/sql/sql_basic_types.h
index 362ab0f1259..84bd165a23f 100644
--- a/sql/sql_basic_types.h
+++ b/sql/sql_basic_types.h
@@ -33,8 +33,12 @@ class date_mode_t
 public:
   enum value_t
   {
-    FUZZY_DATES=     1U,           // C_TIME_FUZZY_DATES
-    TIME_ONLY=       4U,           // C_TIME_TIME_ONLY
+    /*
+      FUZZY_DATES is used for the result will only be used for comparison
+      purposes. Conversion is as relaxed as possible.
+    */
+    FUZZY_DATES=     1U,
+    TIME_ONLY=       4U,
     NO_ZERO_IN_DATE= (1UL << 23),  // MODE_NO_ZERO_IN_DATE
     NO_ZERO_DATE=    (1UL << 24),  // MODE_NO_ZERO_DATE
     INVALID_DATES=   (1UL << 25)   // MODE_INVALID_DATES
@@ -98,11 +102,10 @@ const date_mode_t
   TIME_NO_ZERO_DATE           (date_mode_t::value_t::NO_ZERO_DATE),
   TIME_INVALID_DATES          (date_mode_t::value_t::INVALID_DATES);
 
-// Flags understood by str_to_datetime, str_to_time, number_to_time, check_date
+// Flags understood by str_to_xxx, number_to_xxx, check_date
 static const date_mode_t
   TIME_MODE_FOR_XXX_TO_DATE   (date_mode_t::NO_ZERO_IN_DATE |
                                date_mode_t::NO_ZERO_DATE    |
-                               date_mode_t::INVALID_DATES   |
-                               date_mode_t::TIME_ONLY);
+                               date_mode_t::INVALID_DATES);
 
 #endif
diff --git a/sql/sql_class.h b/sql/sql_class.h
index d8f0a794222..52cc54b85ef 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -4955,9 +4955,6 @@ my_eof(THD *thd)
 
 inline date_mode_t sql_mode_for_dates(THD *thd)
 {
-  static_assert(C_TIME_FUZZY_DATES   == date_mode_t::FUZZY_DATES &&
-                C_TIME_TIME_ONLY     == date_mode_t::TIME_ONLY,
-                "sql_mode_t and pure C library date flags must be equal");
   static_assert(MODE_NO_ZERO_DATE    == date_mode_t::NO_ZERO_DATE &&
                 MODE_NO_ZERO_IN_DATE == date_mode_t::NO_ZERO_IN_DATE &&
                 MODE_INVALID_DATES   == date_mode_t::INVALID_DATES,
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index b98f8aabdc1..0ba06ab161a 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -7685,11 +7685,11 @@ copy_event_to_schema_table(THD *thd, TABLE *sch_table, TABLE *event_table)
     sch_table->field[ISE_ON_COMPLETION]->
                                 store(STRING_WITH_LEN("PRESERVE"), scs);
 
-  number_to_datetime(et.created, 0, &time, 0, &not_used);
+  number_to_datetime_or_date(et.created, 0, &time, 0, &not_used);
   DBUG_ASSERT(not_used==0);
   sch_table->field[ISE_CREATED]->store_time(&time);
 
-  number_to_datetime(et.modified, 0, &time, 0, &not_used);
+  number_to_datetime_or_date(et.modified, 0, &time, 0, &not_used);
   DBUG_ASSERT(not_used==0);
   sch_table->field[ISE_LAST_ALTERED]->store_time(&time);
 
diff --git a/sql/sql_time.cc b/sql/sql_time.cc
index 9562394f11e..ff02bfa0ae4 100644
--- a/sql/sql_time.cc
+++ b/sql/sql_time.cc
@@ -371,13 +371,14 @@ public:
 };
 
 
-/* Character set-aware version of str_to_time() */
-bool Temporal::str_to_time(MYSQL_TIME_STATUS *status,
-                           const char *str, size_t length, CHARSET_INFO *cs,
-                           date_mode_t fuzzydate)
+/* Character set-aware version of str_to_datetime_or_date_or_time() */
+bool Temporal::str_to_datetime_or_date_or_time(MYSQL_TIME_STATUS *status,
+                                               const char *str, size_t length,
+                                               CHARSET_INFO *cs,
+                                               date_mode_t fuzzydate)
 {
   TemporalAsciiBuffer tmp(str, length, cs);
-  bool rc= ::str_to_time(tmp.str, tmp.length, this,
+  bool rc= ::str_to_datetime_or_date_or_time(tmp.str, tmp.length, this,
                        ulonglong(fuzzydate & TIME_MODE_FOR_XXX_TO_DATE),
                        status);
   DBUG_ASSERT(status->warnings || !rc);
@@ -385,13 +386,14 @@ bool Temporal::str_to_time(MYSQL_TIME_STATUS *status,
 }
 
 
-/* Character set-aware version of str_to_datetime() */
-bool Temporal::str_to_datetime(MYSQL_TIME_STATUS *status,
-                               const char *str, size_t length, CHARSET_INFO *cs,
-                               date_mode_t flags)
+/* Character set-aware version of str_to_datetime_or_date() */
+bool Temporal::str_to_datetime_or_date(MYSQL_TIME_STATUS *status,
+                                       const char *str, size_t length,
+                                       CHARSET_INFO *cs,
+                                       date_mode_t flags)
 {
   TemporalAsciiBuffer tmp(str, length, cs);
-  bool rc= ::str_to_datetime(tmp.str, tmp.length, this,
+  bool rc= ::str_to_datetime_or_date(tmp.str, tmp.length, this,
                            ulonglong(flags & TIME_MODE_FOR_XXX_TO_DATE),
                            status);
   DBUG_ASSERT(status->warnings || !rc);
@@ -416,7 +418,7 @@ bool Interval_DDhhmmssff::str_to_DDhhmmssff(MYSQL_TIME_STATUS *status,
   if string was truncated during conversion.
 
   NOTE
-    See description of str_to_datetime() for more information.
+    See description of str_to_datetime_xxx() for more information.
 */
 
 bool
diff --git a/sql/sql_type.cc b/sql/sql_type.cc
index a432f37b580..6fa4684884d 100644
--- a/sql/sql_type.cc
+++ b/sql/sql_type.cc
@@ -180,7 +180,10 @@ void Temporal::make_from_str(THD *thd, Warn *warn,
   DBUG_EXECUTE_IF("str_to_datetime_warn",
                   push_warning(thd, Sql_condition::WARN_LEVEL_NOTE,
                                ER_YES, ErrConvString(str, length,cs).ptr()););
-  if (str_to_datetime(warn, str, length, cs, fuzzydate))
+
+  if (fuzzydate & TIME_TIME_ONLY ?
+      str_to_datetime_or_date_or_time(warn, str, length, cs, fuzzydate) :
+      str_to_datetime_or_date(warn, str, length, cs, fuzzydate))
     make_fuzzy_date(&warn->warnings, fuzzydate);
   if (warn->warnings)
     warn->set_str(str, length, &my_charset_bin);
diff --git a/sql/sql_type.h b/sql/sql_type.h
index 5de4c8e431a..2080152e538 100644
--- a/sql/sql_type.h
+++ b/sql/sql_type.h
@@ -267,7 +267,10 @@ public:
   // Convert a number in format hhhmmss.ff to TIME'hhh:mm:ss.ff'
   bool to_time(MYSQL_TIME *to, int *warn) const
   {
-    bool rc= number_to_time(m_neg, m_sec, m_usec, to, warn);
+    bool rc= (m_sec > 9999999 && m_sec <= 99991231235959ULL && !neg()) ?
+      number_to_datetime_or_date(m_sec, m_usec, to,
+                                 C_TIME_INVALID_DATES, warn) < 0 :
+      number_to_time_only(m_neg, m_sec, m_usec, to, warn);
     DBUG_ASSERT(*warn || !rc);
     return rc;
   }
@@ -282,7 +285,7 @@ public:
       *warn= MYSQL_TIME_WARN_OUT_OF_RANGE;
       return true;
     }
-    bool rc= number_to_datetime(m_sec, m_usec, to,
+    bool rc= number_to_datetime_or_date(m_sec, m_usec, to,
                                 ulonglong(flags & TIME_MODE_FOR_XXX_TO_DATE),
                                 warn) == -1;
     DBUG_ASSERT(*warn || !rc);
@@ -576,10 +579,13 @@ protected:
     if (warn->warnings)
       warn->set_decimal(nr);
   }
-  bool str_to_time(MYSQL_TIME_STATUS *st, const char *str, size_t length,
-                   CHARSET_INFO *cs, date_mode_t fuzzydate);
-  bool str_to_datetime(MYSQL_TIME_STATUS *st, const char *str, size_t length,
-                       CHARSET_INFO *cs, date_mode_t fuzzydate);
+  bool str_to_datetime_or_date_or_time(MYSQL_TIME_STATUS *st,
+                                       const char *str, size_t length,
+                                       CHARSET_INFO *cs, date_mode_t fuzzydate);
+  bool str_to_datetime_or_date(MYSQL_TIME_STATUS *st,
+                               const char *str, size_t length,
+                               CHARSET_INFO *cs, date_mode_t fuzzydate);
+
   bool has_valid_mmssff() const
   {
     return minute <= TIME_MAX_MINUTE &&
@@ -990,7 +996,7 @@ private:
   /*
     Convert a valid DATE or DATETIME to TIME.
     Before this call, "this" must be a valid DATE or DATETIME value,
-    e.g. returned from Item::get_date(), str_to_time(), number_to_time().
+    e.g. returned from Item::get_date(), str_to_xxx(), number_to_xxx().
     After this call, "this" is a valid TIME value.
   */
   void valid_datetime_to_valid_time(THD *thd, int *warn, const Options opt)
@@ -999,7 +1005,7 @@ private:
                 time_type == MYSQL_TIMESTAMP_DATETIME);
     /*
       We're dealing with a DATE or DATETIME returned from
-      str_to_time(), number_to_time() or unpack_time().
+      str_to_xxx(), number_to_xxx() or unpack_time().
       Do some asserts to make sure the result hour value
       after mixing days to hours does not go out of the valid TIME range.
       The maximum hour value after mixing days will be 31*24+23=767,
@@ -1025,7 +1031,7 @@ private:
   /**
     Convert valid DATE/DATETIME to valid TIME if needed.
     This method is called after Item::get_date(),
-    str_to_time(), number_to_time().
+    str_to_xxx(), number_to_xxx().
     which can return only valid TIME/DATE/DATETIME values.
     Before this call, "this" is:
     - either a valid TIME/DATE/DATETIME value
@@ -1061,14 +1067,14 @@ private:
   }
 
   /*
-    This method is called after number_to_time() and str_to_time(),
+    This method is called after number_to_xxx() and str_to_xxx(),
     which can return DATE or DATETIME values. Convert to TIME if needed.
     We trust that xxx_to_time() returns a valid TIME/DATE/DATETIME value,
     so here we need to do only simple validation.
   */
   void xxx_to_time_result_to_valid_value(THD *thd, int *warn, const Options opt)
   {
-    // str_to_time(), number_to_time() never return MYSQL_TIMESTAMP_ERROR
+    // str_to_xxx(), number_to_xxx() never return MYSQL_TIMESTAMP_ERROR
     DBUG_ASSERT(time_type != MYSQL_TIMESTAMP_ERROR);
     valid_MYSQL_TIME_to_valid_value(thd, warn, opt);
   }
@@ -1106,7 +1112,8 @@ public:
        const char *str, size_t len, CHARSET_INFO *cs,
        const Options opt)
   {
-    if (str_to_time(status, str, len, cs, opt.get_date_flags()))
+    if (str_to_datetime_or_date_or_time(status, str, len, cs,
+                                        opt.get_date_flags()))
       time_type= MYSQL_TIMESTAMP_NONE;
     // The below call will optionally add notes to already collected warnings:
     xxx_to_time_result_to_valid_value(thd, &status->warnings, opt);
@@ -1306,7 +1313,7 @@ protected:
                      date_mode_t flags)
   {
     DBUG_ASSERT(bool(flags & TIME_TIME_ONLY) == false);
-    if (str_to_datetime(status, str, len, cs, flags))
+    if (str_to_datetime_or_date(status, str, len, cs, flags))
       time_type= MYSQL_TIMESTAMP_NONE;
   }
 public:
diff --git a/storage/spider/spd_db_mysql.cc b/storage/spider/spd_db_mysql.cc
index df2de2cb637..3af7c424c3d 100644
--- a/storage/spider/spd_db_mysql.cc
+++ b/storage/spider/spd_db_mysql.cc
@@ -618,6 +618,15 @@ SPIDER_DB_ROW *spider_db_mysql_result::fetch_row_from_tmp_table(
   DBUG_RETURN((SPIDER_DB_ROW *) &row);
 }
 
+
+static my_bool str_to_datetime(const char *str, size_t length,
+                               MYSQL_TIME *l_time,
+                               ulonglong flags, MYSQL_TIME_STATUS *status)
+{
+  return str_to_datetime_or_date(str, length, l_time, flags, status);
+}
+
+
 int spider_db_mysql_result::fetch_table_status(
   int mode,
   ha_rows &records,