diff options
| author | unknown <kaa@polly.local> | 2006-10-11 14:16:30 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2006-10-11 14:16:30 +0400 |
| commit | 78f47fbf3a600157c63a2dccee865b07d3a94b1c (patch) | |
| tree | ede2b70c4281feecf1c13c6253569bac4ec72722 /sql/time.cc | |
| parent | 17bda20821e3d885456ec2fe80e87a4ca5a5c25e (diff) | |
| parent | 634d3ff2c658902fa3ed4eb0f988a79564cfe94e (diff) | |
| download | mariadb-git-78f47fbf3a600157c63a2dccee865b07d3a94b1c.tar.gz | |
Merge polly.local:/tmp/maint/bug11655/my41-bug11655
into polly.local:/tmp/maint/bug11655/my50-bug11655
sql/time.cc:
Auto merged
include/my_time.h:
Manually merged
mysql-test/r/func_sapdb.result:
Manually merged
mysql-test/r/func_time.result:
Manually merged
mysql-test/t/func_time.test:
Manually merged
sql-common/my_time.c:
Manually merged
sql/field.cc:
Manually merged
sql/item_timefunc.cc:
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 5069031081d..c71ea08fb77 100644 --- a/sql/time.cc +++ b/sql/time.cc @@ -254,9 +254,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; |