Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1

client/mysqldump.c

@@ -3378,10 +3378,10 @@ static int replace(DYNAMIC_STRING *ds_str,
                    const char *search_str, ulong search_len,
                    const char *replace_str, ulong replace_len)
 {
+  DYNAMIC_STRING ds_tmp;
   const char *start= strstr(ds_str->str, search_str);
   if (!start)
     return 1;
-  DYNAMIC_STRING ds_tmp;
   init_dynamic_string(&ds_tmp, "",
 		      ds_str->length + replace_len, 256);
   dynstr_append_mem(&ds_tmp, ds_str->str, start - ds_str->str);