diff options
| author | Daniel Black <daniel@linux.ibm.com> | 2018-05-07 09:40:57 +1000 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2018-05-07 14:37:38 +0400 |
| commit | 005d53f6d59fe8e1e118c63b9af57fea2a31f4f2 (patch) | |
| tree | 1a098e12710543d6011719dcffb10cd129c46288 /sql/sp.cc | |
| parent | c5b28e55f6ff2a77bf67a2052cc4f4ddd73bc151 (diff) | |
| download | mariadb-git-005d53f6d59fe8e1e118c63b9af57fea2a31f4f2.tar.gz | |
sp_cache_package_routine: fix compile warning
(clang-3.8)
sql/sp.cc:2834:53: warning: implicit conversion of NULL constant to 'size_t' (aka 'unsigned long') [-Wnull-conversion]
size_t prefix_length= dot ? dot - tmp.str + 1 : NULL;
~~~~~~~~~~~~~ ^~~~
0
Diffstat (limited to 'sql/sp.cc')
| -rw-r--r-- | sql/sp.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index 4a0ce65bf75..1d0f32a2888 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -2831,7 +2831,7 @@ Sp_handler::sp_cache_package_routine(THD *thd, sp_package *pkg= ph ? ph->get_package() : NULL; LEX_CSTRING tmp= name->m_name; const char *dot= strrchr(tmp.str, '.'); - size_t prefix_length= dot ? dot - tmp.str + 1 : NULL; + size_t prefix_length= dot ? dot - tmp.str + 1 : 0; tmp.str+= prefix_length; tmp.length-= prefix_length; LEX *rlex= pkg ? pkg->m_routine_implementations.find(tmp, type()) : NULL; |