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, 1 insertions, 1 deletions

diff --git a/client/mysqltest.c b/client/mysqltest.c
index 9914887380b..3dbcaf891ba 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -1536,7 +1536,7 @@ int do_while(struct st_query* q)
 
 int do_delimiter(char *p)
 {
-  while (*p && my_isspace(system_charset_info,*p))
+  while (*p && my_isspace(charset_info,*p))
     p++;
   if (!*p)
     die("Missing delimiter character\n");