summaryrefslogtreecommitdiff
path: root/sql/sp_pcontext.cc
diff options
context:
space:
mode:
authorunknown <pem@mysql.com>2003-03-20 11:57:05 +0100
committerunknown <pem@mysql.com>2003-03-20 11:57:05 +0100
commitfa870804d37c27a69551c9767b9a17224fe495b9 (patch)
tree1ff2eb84da87aeb7018e7aa576dfa3a9be0868e1 /sql/sp_pcontext.cc
parentaddf8ea04ec295a679845cd1911d5e3504c91fab (diff)
downloadmariadb-git-fa870804d37c27a69551c9767b9a17224fe495b9.tar.gz
Post post merge fix. Made the broken ip test work again.
sql/sp_head.cc: Added some more DBUG output. sql/sp_pcontext.cc: Post post merge fix.
Diffstat (limited to 'sql/sp_pcontext.cc')
-rw-r--r--sql/sp_pcontext.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/sp_pcontext.cc b/sql/sp_pcontext.cc
index 9cf7a45b46b..9d22c6be62b 100644
--- a/sql/sp_pcontext.cc
+++ b/sql/sp_pcontext.cc
@@ -65,10 +65,14 @@ sp_pcontext::find_pvar(LEX_STRING *name)
while (i-- > 0)
{
+ uint len= m_pvar[i].name->const_string()->length();
+
+ if (name->length > len)
+ len= name->length;
if (my_strncasecmp(system_charset_info,
name->str,
m_pvar[i].name->const_string()->ptr(),
- name->length) == 0)
+ len) == 0)
{
return m_pvar + i;
}