Post-merge fixes.

mysql-test/r/sp.result:
  Post-merge fixes.
  (And disabled the ip test, since some change in 4.1 broke it.)
mysql-test/t/sp.test:
  Post-merge fixes.
  (And disabled the ip test, since some change in 4.1 broke it.)

1 files changed, 6 insertions, 2 deletions

diff --git a/sql/sp_pcontext.cc b/sql/sp_pcontext.cc
index 407151c3e38..9cf7a45b46b 100644
--- a/sql/sp_pcontext.cc
+++ b/sql/sp_pcontext.cc
@@ -61,13 +61,17 @@ sp_pcontext::grow()
 sp_pvar_t *
 sp_pcontext::find_pvar(LEX_STRING *name)
 {
-  String n(name->str, name->length, default_charset_info);
   uint i = m_i;
 
   while (i-- > 0)
   {
-    if (stringcmp(&n, m_pvar[i].name->const_string()) == 0)
+    if (my_strncasecmp(system_charset_info,
+		       name->str,
+		       m_pvar[i].name->const_string()->ptr(),
+		       name->length) == 0)
+    {
       return m_pvar + i;
+    }
   }
   return NULL;
 }