diff options
author | hery.ramilison@oracle.com <> | 2011-07-06 01:13:50 +0200 |
---|---|---|
committer | MySQL Release Engineering <mysql-re_ww@oracle.com> | 2011-07-06 01:13:50 +0200 |
commit | c74d844de30136c570c3bca089d1f2949d00603c (patch) | |
tree | 31e14059cf5a1e5e8c1601a2488b98c4af1bfeb0 /sql/item_timefunc.cc | |
parent | 3b69f27e59909e67fed27c4d728b96483188a663 (diff) | |
parent | 1c810152963f770fae011b29ae30fbafbc516b23 (diff) | |
download | mariadb-git-c74d844de30136c570c3bca089d1f2949d00603c.tar.gz |
Merge from mysql-5.5.14-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 c828139f9f9..97ba38aa5be 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -1451,7 +1451,7 @@ bool get_interval_value(Item *args,interval_type int_type, else { String *res; - if (!(res=args->val_str(str_value))) + if (!(res= args->val_str_ascii(str_value))) return (1); /* record negative intervalls in interval->neg */ |