Merge polly.local:/tmp/maint/bug11655/my41-bug11655

into  polly.local:/home/kaa/src/maint/m41-maint--07OGk


sql/field.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
mysql-test/r/func_time.result:
  Manually merged
mysql-test/t/func_time.test:
  Manually merged

1 files changed, 13 insertions, 1 deletions

diff --git a/include/my_time.h b/include/my_time.h
index 94701e159c4..11c653f70d0 100644
--- a/include/my_time.h
+++ b/include/my_time.h
@@ -44,12 +44,24 @@ typedef long my_time_t;
 #define TIME_FUZZY_DATE    1
 #define TIME_DATETIME_ONLY 2
 
+#define MYSQL_TIME_WARN_TRUNCATED    1
+#define MYSQL_TIME_WARN_OUT_OF_RANGE 2
+
+/* Limits for the TIME data type */
+#define TIME_MAX_HOUR 838
+#define TIME_MAX_MINUTE 59
+#define TIME_MAX_SECOND 59
+#define TIME_MAX_VALUE (TIME_MAX_HOUR*10000 + TIME_MAX_MINUTE*100 + \
+                        TIME_MAX_SECOND)
+
 enum enum_mysql_timestamp_type
 str_to_datetime(const char *str, uint length, MYSQL_TIME *l_time,
                 uint flags, int *was_cut);
 
 bool str_to_time(const char *str,uint length, MYSQL_TIME *l_time,
-                 int *was_cut);
+                 int *warning);
+
+int check_time_range(struct st_mysql_time *time, int *warning);
 
 long calc_daynr(uint year,uint month,uint day);