Commit 92192355 authored by unknown's avatar unknown
Browse files

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
parents 8247821b 752e5f1e

client/mysqldump.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

configure.in

+12 −0
Original line number Diff line number Diff line
@@ -1058,6 +1058,18 @@ EOF 
        extra/Makefile.in)

          cat > $filesed << EOF

s,\(extra/comp_err\)\$(EXEEXT),\1.linux,

EOF

          ;;

        libmysql/Makefile.in)

          cat > $filesed << EOF

s,libyassl.la,.libs/libyassl.a,

s,libtaocrypt.la,.libs/libtaocrypt.a,

EOF

          ;;

        libmysql_r/Makefile.in)

          cat > $filesed << EOF

s,libyassl.la,.libs/libyassl.a,

s,libtaocrypt.la,.libs/libtaocrypt.a,

EOF

          ;;

        client/Makefile.in)

netware/BUILD/mwldnlm

+7 −0
Original line number Diff line number Diff line
@@ -3,6 +3,13 @@ 
# stop on errors

set -e



# If libtool passes "x" as the first argument to this script

# it's an indication that libtool is trying to unpack .la's

# so they can be added to a new library

# This step does not work on Netware and we avoid it by

# replacing the .la library with the path to the .a library

# in Makefile.in



args=" $*"



# NOTE: Option 'pipefail' is not standard sh