Post post merge fix. Made the broken ip test work again.

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;
     }