Rename of my_strdup_with_lenght to match the more common "strndup" method. Soo its now my_strndup().

my_stat() gettinng the correct parameter list may be next :)


client/mysqlslap.c:
  rename
extra/comp_err.c:
  rename
include/my_sys.h:
  replace
mysys/mf_tempdir.c:
  replace
mysys/my_malloc.c:
  replace
mysys/safemalloc.c:
  replace
sql/ha_federated.cc:
  replace
sql/log_event.cc:
  replace
sql/set_var.cc:
  replace
sql/set_var.h:
  replace
storage/myisam/ft_stopwords.c:
  replace

11 files changed, 17 insertions, 17 deletions

diff --git a/client/mysqlslap.c b/client/mysqlslap.c
index c993b93e608..be034da0c8c 100644
--- a/client/mysqlslap.c
+++ b/client/mysqlslap.c
@@ -1184,7 +1184,7 @@ parse_delimiter(const char *script, statement **stmt, char delm)
        tmp= tmp->next)
   {
     count++;
-    tmp->string= my_strdup_with_length(ptr, (size_t)(retstr - ptr), MYF(MY_FAE));
+    tmp->string= my_strndup(ptr, (size_t)(retstr - ptr), MYF(MY_FAE));
     tmp->length= (size_t)(retstr - ptr);
     DBUG_PRINT("info", (" Creating : %.*s\n", (uint)tmp->length, tmp->string));
     ptr+= retstr - ptr + 1;
@@ -1195,7 +1195,7 @@ parse_delimiter(const char *script, statement **stmt, char delm)
 
   if (ptr != script+length)
   {
-    tmp->string= my_strdup_with_length(ptr, (size_t)((script + length) - ptr), 
+    tmp->string= my_strndup(ptr, (size_t)((script + length) - ptr), 
                                        MYF(MY_FAE));
     tmp->length= (size_t)((script + length) - ptr);
     DBUG_PRINT("info", (" Creating : %.*s\n", (uint)tmp->length, tmp->string));
diff --git a/extra/comp_err.c b/extra/comp_err.c
index 65fc131a5fc..2d685a04087 100644
--- a/extra/comp_err.c
+++ b/extra/comp_err.c
@@ -638,7 +638,7 @@ static char *get_word(char **str)
   DBUG_ENTER("get_word");
 
   *str= find_end_of_word(start);
-  DBUG_RETURN(my_strdup_with_length(start, (uint) (*str - start),
+  DBUG_RETURN(my_strndup(start, (uint) (*str - start),
 				    MYF(MY_WME | MY_FAE)));
 }
 
@@ -672,7 +672,7 @@ static struct message *parse_message_string(struct message *new_message,
   while (*str != ' ' && *str != '\t' && *str)
     str++;
   if (!(new_message->lang_short_name=
-	my_strdup_with_length(start, (uint) (str - start),
+	my_strndup(start, (uint) (str - start),
 			      MYF(MY_WME | MY_FAE))))
     DBUG_RETURN(0);				/* Fatal error */
   DBUG_PRINT("info", ("msg_slang: %s", new_message->lang_short_name));
@@ -692,7 +692,7 @@ static struct message *parse_message_string(struct message *new_message,
   start= str + 1;
   str= parse_text_line(start);
 
-  if (!(new_message->text= my_strdup_with_length(start, (uint) (str - start),
+  if (!(new_message->text= my_strndup(start, (uint) (str - start),
 						 MYF(MY_WME | MY_FAE))))
     DBUG_RETURN(0);				/* Fatal error */
   DBUG_PRINT("info", ("msg_text: %s", new_message->text));
diff --git a/include/my_sys.h b/include/my_sys.h
index 89b0bd4fbec..00c42fc5935 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -136,7 +136,7 @@ extern int NEAR my_errno;		/* Last error in mysys */
 #define my_free(PTR,FLAG) _myfree((PTR), __FILE__, __LINE__,FLAG)
 #define my_memdup(A,B,C) _my_memdup((A),(B), __FILE__,__LINE__,C)
 #define my_strdup(A,C) _my_strdup((A), __FILE__,__LINE__,C)
-#define my_strdup_with_length(A,B,C) _my_strdup_with_length((A),(B),__FILE__,__LINE__,C)
+#define my_strndup(A,B,C) _my_strndup((A),(B),__FILE__,__LINE__,C)
 #define TRASH(A,B) bfill(A, B, 0x8F)
 #define QUICK_SAFEMALLOC sf_malloc_quick=1
 #define NORMAL_SAFEMALLOC sf_malloc_quick=0
@@ -158,7 +158,7 @@ extern gptr my_realloc(gptr oldpoint,uint Size,myf MyFlags);
 extern void my_no_flags_free(gptr ptr);
 extern gptr my_memdup(const byte *from,uint length,myf MyFlags);
 extern char *my_strdup(const char *from,myf MyFlags);
-extern char *my_strdup_with_length(const byte *from, uint length,
+extern char *my_strndup(const byte *from, uint length,
 				   myf MyFlags);
 /* we do use FG (as a no-op) in below so that a typo on FG is caught */
 #define my_free(PTR,FG) ((void)FG,my_no_flags_free(PTR))
@@ -597,7 +597,7 @@ extern gptr _my_memdup(const byte *from,uint length,
 		       const char *sFile, uint uLine,myf MyFlag);
 extern my_string _my_strdup(const char *from, const char *sFile, uint uLine,
 			    myf MyFlag);
-extern char *_my_strdup_with_length(const byte *from, uint length,
+extern char *_my_strndup(const byte *from, uint length,
 				    const char *sFile, uint uLine,
 				    myf MyFlag);
 
diff --git a/mysys/mf_tempdir.c b/mysys/mf_tempdir.c
index 0a3d41efdc5..e79980ab931 100644
--- a/mysys/mf_tempdir.c
+++ b/mysys/mf_tempdir.c
@@ -53,7 +53,7 @@ my_bool init_tmpdir(MY_TMPDIR *tmpdir, const char *pathlist)
     end=strcend(pathlist, DELIM);
     strmake(buff, pathlist, (uint) (end-pathlist));
     length= cleanup_dirname(buff, buff);
-    if (!(copy= my_strdup_with_length(buff, length, MYF(MY_WME))) ||
+    if (!(copy= my_strndup(buff, length, MYF(MY_WME))) ||
         insert_dynamic(&t_arr, (gptr) &copy))
       DBUG_RETURN(TRUE);
     pathlist=end+1;
diff --git a/mysys/my_malloc.c b/mysys/my_malloc.c
index 3f601a42dc9..3fb3866f79c 100644
--- a/mysys/my_malloc.c
+++ b/mysys/my_malloc.c
@@ -83,7 +83,7 @@ char *my_strdup(const char *from, myf my_flags)
 }
 
 
-char *my_strdup_with_length(const byte *from, uint length, myf my_flags)
+char *my_strndup(const byte *from, uint length, myf my_flags)
 {
   gptr ptr;
   if ((ptr=my_malloc(length+1,my_flags)) != 0)
diff --git a/mysys/safemalloc.c b/mysys/safemalloc.c
index 6cdf98c5f5f..e40fd751037 100644
--- a/mysys/safemalloc.c
+++ b/mysys/safemalloc.c
@@ -525,7 +525,7 @@ char *_my_strdup(const char *from, const char *filename, uint lineno,
 } /* _my_strdup */
 
 
-char *_my_strdup_with_length(const byte *from, uint length,
+char *_my_strndup(const byte *from, uint length,
 			     const char *filename, uint lineno,
 			     myf MyFlags)
 {
diff --git a/sql/ha_federated.cc b/sql/ha_federated.cc
index 0dbbf8e1175..af8dfb9a111 100644
--- a/sql/ha_federated.cc
+++ b/sql/ha_federated.cc
@@ -647,7 +647,7 @@ static int parse_url(FEDERATED_SHARE *share, TABLE *table,
   DBUG_PRINT("info", ("Length: %d", table->s->connect_string.length));
   DBUG_PRINT("info", ("String: '%.*s'", table->s->connect_string.length, 
                       table->s->connect_string.str));
-  share->scheme= my_strdup_with_length((const byte*)table->s->
+  share->scheme= my_strndup((const byte*)table->s->
                                        connect_string.str, 
                                        table->s->connect_string.length,
                                        MYF(0));
diff --git a/sql/log_event.cc b/sql/log_event.cc
index f63c454b5ed..15eb4c3aaf0 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -3138,7 +3138,7 @@ Rotate_log_event::Rotate_log_event(const char* new_log_ident_arg,
                       llstr(pos_arg, buff), flags));
 #endif
   if (flags & DUP_NAME)
-    new_log_ident= my_strdup_with_length((const byte*) new_log_ident_arg,
+    new_log_ident= my_strndup((const byte*) new_log_ident_arg,
                                          ident_len, MYF(MY_WME));
   DBUG_VOID_RETURN;
 }
@@ -3162,7 +3162,7 @@ Rotate_log_event::Rotate_log_event(const char* buf, uint event_len,
                      (header_size+post_header_len)); 
   ident_offset = post_header_len; 
   set_if_smaller(ident_len,FN_REFLEN-1);
-  new_log_ident= my_strdup_with_length((byte*) buf + ident_offset,
+  new_log_ident= my_strndup((byte*) buf + ident_offset,
                                        (uint) ident_len,
                                        MYF(MY_WME));
   DBUG_VOID_RETURN;
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 1385155c3b3..b85b2576b83 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -1021,7 +1021,7 @@ bool update_sys_var_str(sys_var_str *var_str, rw_lock_t *var_mutex,
   uint new_length= (var ? var->value->str_value.length() : 0);
   if (!old_value)
     old_value= (char*) "";
-  if (!(res= my_strdup_with_length((byte*)old_value, new_length, MYF(0))))
+  if (!(res= my_strndup((byte*)old_value, new_length, MYF(0))))
     return 1;
   /*
     Replace the old value in such a way that the any thread using
diff --git a/sql/set_var.h b/sql/set_var.h
index 01705d5ff4d..34873947483 100644
--- a/sql/set_var.h
+++ b/sql/set_var.h
@@ -926,7 +926,7 @@ public:
 	     uint name_length_arg, gptr data_arg)
     :name_length(name_length_arg), data(data_arg)
   {
-    name= my_strdup_with_length((byte*) name_arg, name_length, MYF(MY_WME));
+    name= my_strndup((byte*) name_arg, name_length, MYF(MY_WME));
     links->push_back(this);
   }
   inline bool cmp(const char *name_cmp, uint length)
diff --git a/storage/myisam/ft_stopwords.c b/storage/myisam/ft_stopwords.c
index ab51afb0e82..3b5a1752ff7 100644
--- a/storage/myisam/ft_stopwords.c
+++ b/storage/myisam/ft_stopwords.c
@@ -83,7 +83,7 @@ int ft_init_stopwords()
     end=start+len;
     while (ft_simple_get_word(default_charset_info, &start, end, &w, TRUE))
     {
-      if (ft_add_stopword(my_strdup_with_length(w.pos, w.len, MYF(0))))
+      if (ft_add_stopword(my_strndup(w.pos, w.len, MYF(0))))
         goto err1;
     }
     error=0;