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

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2020-07-31 13:51:28 +03:00
parent 6053eb1ce2 f35d172103
commit 66ec3a770f
73 changed files with 880 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_time.h
View File

@ -1,5 +1,5 @@
/* Copyright (c) 2006, 2010, Oracle and/or its affiliates.
Copyright (c) 2011, 2016, MariaDB
Copyright (c) 2011, 2020, MariaDB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -118,15 +118,18 @@ void make_truncated_value_warning(THD *thd,
Sql_condition::enum_warning_level level,
const ErrConv *str_val,
timestamp_type time_type,
const TABLE_SHARE *s, const char *field_name);
const char *db_name, const char *table_name,
const char *field_name);
static inline void make_truncated_value_warning(THD *thd,
Sql_condition::enum_warning_level level, const char *str_val,
size_t str_length, timestamp_type time_type,
const TABLE_SHARE *s, const char *field_name)
const char *db_name, const char *table_name,
const char *field_name)
{
const ErrConvString str(str_val, str_length, &my_charset_bin);
make_truncated_value_warning(thd, level, &str, time_type, s, field_name);
make_truncated_value_warning(thd, level, &str, time_type, db_name, table_name,
field_name);
}
extern DATE_TIME_FORMAT *date_time_format_make(timestamp_type format_type,