diff options
| author | Michael Widenius <monty@askmonty.org> | 2013-06-15 18:32:08 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2013-06-15 18:32:08 +0300 |
| commit | 5f1f2fc0e443f098af24d21f7d1ec1a8166a4030 (patch) | |
| tree | 7b870d0c390c05d6629f4813966e740ea073fcef /sql/sql_time.h | |
| parent | 3143ad589a24ac7581e2195ba0dc13576cb3c9da (diff) | |
| download | mariadb-git-5f1f2fc0e443f098af24d21f7d1ec1a8166a4030.tar.gz | |
Applied all changes from Igor and Sanja
Diffstat (limited to 'sql/sql_time.h')
| -rw-r--r-- | sql/sql_time.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_time.h b/sql/sql_time.h index c1a75bb2ad3..8ce85712256 100644 --- a/sql/sql_time.h +++ b/sql/sql_time.h @@ -19,7 +19,7 @@ #include "my_global.h" /* ulong */ #include "my_time.h" #include "mysql_time.h" /* timestamp_type */ -#include "sql_error.h" /* MYSQL_ERROR */ +#include "sql_error.h" /* Sql_condition */ #include "structs.h" /* INTERVAL */ typedef enum enum_mysql_timestamp_type timestamp_type; @@ -50,13 +50,14 @@ bool int_to_datetime_with_warn(longlong value, MYSQL_TIME *ltime, ulonglong fuzzydate, const char *name); -void make_truncated_value_warning(THD *thd, MYSQL_ERROR::enum_warning_level level, +void make_truncated_value_warning(THD *thd, + Sql_condition::enum_warning_level level, const ErrConv *str_val, timestamp_type time_type, const char *field_name); static inline void make_truncated_value_warning(THD *thd, - MYSQL_ERROR::enum_warning_level level, const char *str_val, + Sql_condition::enum_warning_level level, const char *str_val, uint str_length, timestamp_type time_type, const char *field_name) { |