diff options
| author | kaa@polly.local <> | 2006-10-11 14:22:17 +0400 |
|---|---|---|
| committer | kaa@polly.local <> | 2006-10-11 14:22:17 +0400 |
| commit | 29b5e2955e3256b95165902d8bf6bc83b5162e0f (patch) | |
| tree | 8c12ad718522e6159b6443e11303b539db8077b8 /sql/time.cc | |
| parent | a2467400b7e9bb8a7b9edc027eb2629ad50ec3db (diff) | |
| parent | 02ac635027a89b59e537d1c893a634a15efcb888 (diff) | |
| download | mariadb-git-29b5e2955e3256b95165902d8bf6bc83b5162e0f.tar.gz | |
Merge polly.local:/tmp/maint/bug11655/my50-bug11655
into polly.local:/tmp/maint/bug11655/my51-bug11655
Diffstat (limited to 'sql/time.cc')
| -rw-r--r-- | sql/time.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/time.cc b/sql/time.cc index 0461f7723c6..0229cdf7297 100644 --- a/sql/time.cc +++ b/sql/time.cc @@ -278,9 +278,9 @@ my_time_t TIME_to_timestamp(THD *thd, const TIME *t, my_bool *in_dst_time_gap) bool str_to_time_with_warn(const char *str, uint length, TIME *l_time) { - int was_cut; - bool ret_val= str_to_time(str, length, l_time, &was_cut); - if (was_cut) + int warning; + bool ret_val= str_to_time(str, length, l_time, &warning); + if (ret_val || warning) make_truncated_value_warning(current_thd, str, length, MYSQL_TIMESTAMP_TIME, NullS); return ret_val; |