diff options
| author | Leonard Zhou <zhou.li@sun.com> | 2009-03-27 11:19:48 +0800 |
|---|---|---|
| committer | Leonard Zhou <zhou.li@sun.com> | 2009-03-27 11:19:48 +0800 |
| commit | f606cfeae3f934b4e6864693994ed80b7f2631ef (patch) | |
| tree | d16c0bd2b57fcedbf42a703b06824a19ced0f178 /sql/item_func.cc | |
| parent | 944915cabe8712780e558bc9c41bdb12e5f1a5a7 (diff) | |
| parent | 96e02e57166a37f79c10f5f9afc1f9185e1110a7 (diff) | |
| download | mariadb-git-f606cfeae3f934b4e6864693994ed80b7f2631ef.tar.gz | |
Merge
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 55324923fe2..47e16a1bcc3 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -2758,7 +2758,7 @@ longlong Item_func_find_in_set::val_int() if (is_last_item && !is_separator) str_end= substr_end; if (!my_strnncoll(cs, (const uchar *) str_begin, - str_end - str_begin, + (uint) (str_end - str_begin), find_str, find_str_len)) return (longlong) position; else @@ -4792,7 +4792,7 @@ Item_func_get_system_var(sys_var *var_arg, enum_var_type var_type_arg, :var(var_arg), var_type(var_type_arg), component(*component_arg) { /* set_name() will allocate the name */ - set_name(name_arg, name_len_arg, system_charset_info); + set_name(name_arg, (uint) name_len_arg, system_charset_info); } |