diff options
| author | unknown <cmiller@maint1.mysql.com> | 2006-07-12 05:34:56 +0200 |
|---|---|---|
| committer | unknown <cmiller@maint1.mysql.com> | 2006-07-12 05:34:56 +0200 |
| commit | 0f7258e0f76bafcff0dddfc5b785de8fa774612d (patch) | |
| tree | e219f47c78af013cbed967d7835be85e01ca93e6 | |
| parent | d1a31ef52ab0f29ada3a65125c8c6d1f761c37ea (diff) | |
| parent | 26ddd5cb0c2f93f39f05f89b642642fb2c79f5d0 (diff) | |
| download | mariadb-git-0f7258e0f76bafcff0dddfc5b785de8fa774612d.tar.gz | |
Merge cmiller@bk-internal.mysql.com:/home/bk/mysql-4.1
into maint1.mysql.com:/data/localhome/cmiller/mysql-4.1
| -rw-r--r-- | mysql-test/r/date_formats.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/date_formats.test | 8 | ||||
| -rw-r--r-- | sql/time.cc | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/mysql-test/r/date_formats.result b/mysql-test/r/date_formats.result index 00335d2b1b0..035d98d2b74 100644 --- a/mysql-test/r/date_formats.result +++ b/mysql-test/r/date_formats.result @@ -525,3 +525,9 @@ TIME_FORMAT("24:00:00", '%l %p') SELECT TIME_FORMAT("25:00:00", '%l %p'); TIME_FORMAT("25:00:00", '%l %p') 1 AM +SELECT DATE_FORMAT('%Y-%m-%d %H:%i:%s', 1151414896); +DATE_FORMAT('%Y-%m-%d %H:%i:%s', 1151414896) +NULL +Warnings: +Warning 1292 Truncated incorrect datetime value: '%Y-%m-%d %H:%i:%s' +"End of 4.1 tests" diff --git a/mysql-test/t/date_formats.test b/mysql-test/t/date_formats.test index 362f4614464..922d047eac8 100644 --- a/mysql-test/t/date_formats.test +++ b/mysql-test/t/date_formats.test @@ -289,7 +289,6 @@ drop table t1; select str_to_date( 1, NULL ); select str_to_date( NULL, 1 ); select str_to_date( 1, IF(1=1,NULL,NULL) ); -# End of 4.1 tests # # Bug#11326 @@ -312,3 +311,10 @@ SELECT TIME_FORMAT("12:00:00", '%l %p'); SELECT TIME_FORMAT("23:00:00", '%l %p'); SELECT TIME_FORMAT("24:00:00", '%l %p'); SELECT TIME_FORMAT("25:00:00", '%l %p'); + +# +# Bug#20729: Bad date_format() call makes mysql server crash +# +SELECT DATE_FORMAT('%Y-%m-%d %H:%i:%s', 1151414896); + +--echo "End of 4.1 tests" diff --git a/sql/time.cc b/sql/time.cc index e76b169b336..ef832ac5a70 100644 --- a/sql/time.cc +++ b/sql/time.cc @@ -797,7 +797,7 @@ void make_truncated_value_warning(THD *thd, const char *str_val, } sprintf(warn_buff, ER(ER_TRUNCATED_WRONG_VALUE), type_str, str.ptr()); - push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, + push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, ER_TRUNCATED_WRONG_VALUE, warn_buff); } |