diff options
| author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-04-29 18:46:06 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-04-29 18:46:06 +0500 |
| commit | 95f51da26013aa962e5e8648e5bcad8bebc06b4e (patch) | |
| tree | 305dac52043ee4eb275a83ea81b31c318a9e874c /sql/item_cmpfunc.cc | |
| parent | 2031f55751dad44950252ab711cde893b3bce674 (diff) | |
| download | mariadb-git-95f51da26013aa962e5e8648e5bcad8bebc06b4e.tar.gz | |
merging fix
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 982179a3bb2..ad7b877cd0b 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -619,8 +619,9 @@ get_date_from_str(THD *thd, String *str, timestamp_type warn_type, if (error || *error_arg) { - make_truncated_value_warning(thd, str->ptr(), str->length(), warn_type, - warn_name); + make_truncated_value_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, + str->ptr(), str->length(), + warn_type, warn_name); *error_arg= TRUE; } return value; |