diff options
| author | unknown <hf@deer.(none)> | 2004-03-15 16:32:53 +0400 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-03-15 16:32:53 +0400 |
| commit | 9a3fbf0d96426dd5273bb8992c4b131965e6d1e1 (patch) | |
| tree | 2cab975faaba9bbd5292393c6b415c5159079213 /sql/item_strfunc.cc | |
| parent | 22657f672c8d4c005f85cd3efc714d98b635f3f0 (diff) | |
| download | mariadb-git-9a3fbf0d96426dd5273bb8992c4b131965e6d1e1.tar.gz | |
Fix for valgrind's warning
sql/gstream.cc:
checking for ending \0 changed with m_limit
sql/gstream.h:
checking for ending \0 changed with m_limit
sql/item_geofunc.cc:
we should check for null value before we use val_str result
sql/item_strfunc.cc:
get rid of annoying warnings
sql/spatial.h:
error about size_t type fixed
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index bcf534c9e84..3c8689e1588 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -2241,7 +2241,7 @@ String *Item_func_hex::val_str(String *str) return &tmp_value; } -int inline hexchar_to_int(char c) +inline int hexchar_to_int(char c) { if (c <= '9' && c >= '0') return c-'0'; @@ -2721,7 +2721,7 @@ String *Item_func_uuid::val_str(String *str) { ulong tmp=sql_rnd_with_mutex(); uchar mac[6]; - int i; + unsigned int i; if (my_gethwaddr(mac)) { /* |