diff options
author | unknown <monty@mysql.com> | 2005-04-04 16:43:25 +0300 |
---|---|---|
committer | unknown <monty@mysql.com> | 2005-04-04 16:43:25 +0300 |
commit | ce169a5424e76969e74828d4214cfedb0a425ee5 (patch) | |
tree | 3ad1b7dadf9b015e59e0f817db58b9dbc155cb5e /sql/time.cc | |
parent | 0c9304fd6d9b1648f3157a6a5e3f0ec536d82560 (diff) | |
download | mariadb-git-ce169a5424e76969e74828d4214cfedb0a425ee5.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
configure.in:
Don't use -lsupc++ with gcc 3.3 and below as this gives linking problems when linking staticly
mysql-test/r/func_time.result:
New warnings
mysql-test/r/row.result:
Moved code around to get things to work with --ps-protocol
Note that one on warning disappered, but it should appear again when bug #9600 is fixed
mysql-test/r/strict.result:
enabled more tests
Added more tests
mysql-test/r/union.result:
Test that UNION generates correct row format
mysql-test/t/row.test:
Moved test to get things to work with --ps-protocol
mysql-test/t/strict.test:
enabled more tests
Added more tests
mysql-test/t/union.test:
Test that UNION generates correct row format
sql/item.cc:
Removed compiler warning
Simple cleanup
sql/sp.cc:
Fix that mysql.proc works with new VARCHAR fields
sql/time.cc:
Give warnings for wrong zero dates
tests/mysql_client_test.c:
More startup information
Diffstat (limited to 'sql/time.cc')
-rw-r--r-- | sql/time.cc | 3 |
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; } |