diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-25 22:05:56 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-25 22:05:56 +0300 |
commit | 4a32e2395e1ff6cf7274d0567282b1747031108b (patch) | |
tree | f20565057eebcd25fda9292e66695bbf8a409f41 /sql/sql_time.h | |
parent | b773270c397a97425abc506e7d7fbc5fedb99d9c (diff) | |
parent | 86c3ba65aa39e1e81c52f3455a1bcf187906dffc (diff) | |
download | mariadb-git-4a32e2395e1ff6cf7274d0567282b1747031108b.tar.gz |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'sql/sql_time.h')
-rw-r--r-- | sql/sql_time.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_time.h b/sql/sql_time.h index c6462c93e21..91a026512c1 100644 --- a/sql/sql_time.h +++ b/sql/sql_time.h @@ -105,7 +105,7 @@ inline void datetime_to_date(MYSQL_TIME *ltime) DBUG_ASSERT(ltime->time_type == MYSQL_TIMESTAMP_DATE || ltime->time_type == MYSQL_TIMESTAMP_DATETIME); DBUG_ASSERT(ltime->neg == 0); - ltime->hour= ltime->minute= ltime->second= ltime->second_part= 0; + ltime->second_part= ltime->hour= ltime->minute= ltime->second= 0; ltime->time_type= MYSQL_TIMESTAMP_DATE; } inline void date_to_datetime(MYSQL_TIME *ltime) |