Merge branch '10.1' into 10.2

1 files changed, 7 insertions, 0 deletions

diff --git a/sql/field.cc b/sql/field.cc
index a635b344a31..60df918bd63 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -5811,6 +5811,13 @@ static void calc_datetime_days_diff(MYSQL_TIME *ltime, long days)
                            ltime->second) * 1000000LL +
                            ltime->second_part);
     unpack_time(timediff, ltime);
+    /*
+      unpack_time() broke down hours into ltime members hour,day,month.
+      Mix them back to ltime->hour using the same factors
+      that pack_time()/unpack_time() use (i.e. 32 for month).
+    */
+    ltime->hour+= (ltime->month * 32 + ltime->day) * 24;
+    ltime->month= ltime->day= 0;
   }
   ltime->time_type= MYSQL_TIMESTAMP_TIME;
 }