diff options
| author | unknown <kaa@polly.local> | 2006-10-12 12:36:13 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2006-10-12 12:36:13 +0400 |
| commit | 131d8b8645f0f5628cd62f5c0b1a3457f9f63307 (patch) | |
| tree | 4763f87f5b35217d4afe850ab88ba2dfc0974778 /sql/time.cc | |
| parent | 1f816053d2f531062c5449fc4cea71c2c41792d6 (diff) | |
| parent | 45af97ad1d06f1ef66d9f4dad53b6cc255e781a2 (diff) | |
| download | mariadb-git-131d8b8645f0f5628cd62f5c0b1a3457f9f63307.tar.gz | |
Merge polly.local:/tmp/maint/bug11655/my51-bug11655
into polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
include/my_time.h:
Auto merged
mysql-test/t/func_time.test:
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
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 467dbc684a5..25a1995dd01 100644 --- a/sql/time.cc +++ b/sql/time.cc @@ -289,9 +289,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; |