summaryrefslogtreecommitdiff
path: root/sql/time.cc
diff options
context:
space:
mode:
authormonty@mysql.com <>2005-04-04 16:43:25 +0300
committermonty@mysql.com <>2005-04-04 16:43:25 +0300
commit5ba3f707f773f1f6a5e2c9cb948c03e68d527668 (patch)
tree3ad1b7dadf9b015e59e0f817db58b9dbc155cb5e /sql/time.cc
parent9616c9a80d6490ac33bc80c3c9444e8d2bf726e5 (diff)
downloadmariadb-git-5ba3f707f773f1f6a5e2c9cb948c03e68d527668.tar.gz
Don't use -lsupc++ with gcc 3.3 and below as this gives linking problems when linking staticly
Fix that mysql.proc works with new VARCHAR fields Give warnings for wrong zero dates
Diffstat (limited to 'sql/time.cc')
-rw-r--r--sql/time.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/time.cc b/sql/time.cc
index 52a2ae13892..a3ec2283860 100644
--- a/sql/time.cc
+++ b/sql/time.cc
@@ -186,6 +186,7 @@ ulong convert_month_to_period(ulong month)
NOTE
See description of str_to_datetime() for more information.
*/
+
timestamp_type
str_to_datetime_with_warn(const char *str, uint length, TIME *l_time,
uint flags)
@@ -199,7 +200,7 @@ str_to_datetime_with_warn(const char *str, uint length, TIME *l_time,
(MODE_INVALID_DATES |
MODE_NO_ZERO_DATE))),
&was_cut);
- if (was_cut)
+ if (was_cut || ts_type <= MYSQL_TIMESTAMP_ERROR)
make_truncated_value_warning(current_thd, str, length, ts_type, NullS);
return ts_type;
}