diff options
| author | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2010-11-25 13:46:18 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2010-11-25 13:46:18 +0300 |
| commit | 9e3fa25e0193c5f8c9282a554cd61786abba3ed7 (patch) | |
| tree | 20f90a9011c7827c6a21f0f5a24351a42d65f903 /sql/item_timefunc.cc | |
| parent | ddbcb7b5c4c9ea0dbac946eac5df82cb14dcbd01 (diff) | |
| parent | 07fd5d6f993992f04074c6d16e08cdf42d22cc97 (diff) | |
| download | mariadb-git-9e3fa25e0193c5f8c9282a554cd61786abba3ed7.tar.gz | |
Auto-merge from mysql-5.5.7-rc-release.
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 91402ae1246..73b8b6047e0 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -3465,7 +3465,7 @@ bool Item_func_str_to_date::get_date(MYSQL_TIME *ltime, uint fuzzy_date) return 0; null_date: - if (fuzzy_date & TIME_NO_ZERO_DATE) + if (val && (fuzzy_date & TIME_NO_ZERO_DATE)) { char buff[128]; strmake(buff, val->ptr(), min(val->length(), sizeof(buff)-1)); |