Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


mysql-test/t/func_misc.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
strings/ctype-ujis.c:
  Auto merged

1 files changed, 6 insertions, 6 deletions

diff --git a/strings/r_strinstr.c b/strings/r_strinstr.c
index 98118015456..fb1e0c5a090 100644
--- a/strings/r_strinstr.c
+++ b/strings/r_strinstr.c
@@ -25,14 +25,14 @@
 #include <my_global.h>
 #include "m_string.h"
 
-uint r_strinstr(reg1 my_string str,int from, reg4 my_string search)
+size_t r_strinstr(reg1 const char * str, size_t from, reg4 const char * search)
 {
-  reg2 my_string	i, j;
-  uint		len = (uint) strlen(search);
+  reg2 const char *i, *j;
+  size_t	len = strlen(search);
   /* pointer to the last char of buff */
-  my_string	start = str + from - 1;
+  const char *	start = str + from - 1;
   /* pointer to the last char of search */
-  my_string	search_end = search + len - 1;
+  const char *	search_end = search + len - 1;
 
  skip:
   while (start >= str)		/* Cant be != because the first char */
@@ -43,7 +43,7 @@ uint r_strinstr(reg1 my_string str,int from, reg4 my_string search)
       while (j >= search && start > str)
 	if (*i-- != *j--)
 	  goto skip;
-      return (uint) ((start - len) - str + 3);
+      return (size_t) ((start - len) - str + 3);
     }
   }
   return (0);