diff options
| author | unknown <kaa@polly.local> | 2006-10-11 14:22:17 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2006-10-11 14:22:17 +0400 |
| commit | 186b831244239149520d0742c3a5947f36c75218 (patch) | |
| tree | 8c12ad718522e6159b6443e11303b539db8077b8 /sql/time.cc | |
| parent | 2b90301dacf4106e1e556f793ad3f2443b315268 (diff) | |
| parent | 78f47fbf3a600157c63a2dccee865b07d3a94b1c (diff) | |
| download | mariadb-git-186b831244239149520d0742c3a5947f36c75218.tar.gz | |
Merge polly.local:/tmp/maint/bug11655/my50-bug11655
into polly.local:/tmp/maint/bug11655/my51-bug11655
include/my_time.h:
Auto merged
mysql-test/r/func_sapdb.result:
Auto merged
sql-common/my_time.c:
Auto merged
sql/field.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/time.cc:
Auto merged
mysql-test/r/func_time.result:
Manually merged
mysql-test/t/func_time.test:
Manually merged
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; |