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

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


client/mysqldump.c:
  Auto merged
sql/sql_show.cc:
  Auto merged
configure.in:
  Manual merge, the filesed of Makfile.in has been removed but needed to
  add it back in to convert .la libs to .a libs

1 files changed, 2 insertions, 2 deletions

diff --git a/client/mysqldump.c b/client/mysqldump.c
index 229ba103ab4..992f20db6b6 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -1208,7 +1208,7 @@ static void print_xml_tag(FILE * xml_file, const char* sbeg, const char* send,
                           const char* first_attribute_name, ...)
 {
   va_list arg_list;
-  char *attribute_name, *attribute_value;
+  const char *attribute_name, *attribute_value;
 
   fputs(sbeg, xml_file);
   fputc('<', xml_file);
@@ -1458,7 +1458,7 @@ static uint dump_events_for_db(char *db)
 static void print_blob_as_hex(FILE *output_file, const char *str, ulong len)
 {
     /* sakaik got the idea to to provide blob's in hex notation. */
-    char *ptr= str, *end= ptr + len;
+    const char *ptr= str, *end= ptr + len;
     for (; ptr < end ; ptr++)
       fprintf(output_file, "%02X", *((uchar *)ptr));
     check_io(output_file);