database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext

Browse Source
This commit is contained in:
Alexander Barkov
2017-10-02 22:35:13 +04:00
parent 6857cb57fe 387bdf07ae
commit 8ae8cd6348
288 changed files with 1987 additions and 2427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_time.h
View File

@ -194,7 +194,7 @@ inline bool parse_date_time_format(timestamp_type format_type,
{
return parse_date_time_format(format_type,
date_time_format->format.str,
date_time_format->format.length,
(uint) date_time_format->format.length,
date_time_format);
}