1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

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
This commit is contained in:
unknown
2006-10-24 15:46:54 +02:00
3 changed files with 21 additions and 2 deletions

View File

@ -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);