Commit 752e5f1e authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
parents 7cd0f1a6 8b3f8232

client/mysqldump.c

+2 −2
Original line number Diff line number Diff line
@@ -1195,7 +1195,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);
@@ -1318,7 +1318,7 @@ static void print_xml_row(FILE *xml_file, const char *row_name, 
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

+4 −0
Original line number Diff line number Diff line
@@ -1176,12 +1176,16 @@ EOF 
          cat > $filesed << EOF

s,\(\./conf_to_src\)\( \$(top_srcdir)\),\1.linux\2,

s,\(: conf_to_src\),\1.linux,

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

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

EOF

          ;;

        libmysql_r/Makefile.in)

          cat > $filesed << EOF

s,\(\./conf_to_src\)\( \$(top_srcdir)\),\1.linux\2,

s,\(: conf_to_src\),\1.linux,

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

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

EOF

          ;;

        strings/Makefile.in)

netware/BUILD/compile-netware-END

+7 −2
Original line number Diff line number Diff line
@@ -18,8 +18,13 @@ rm -rf Makefile.in.bk 
# Setup Metrowerks environment

. $path/mwenv



# Temporary hack to allow building from source dist

if [ ! "$USER"=pushbuild ]

then

  # Run autotools(use BUILD/autorun.sh)

  echo "Running autotools again(BUILD/autorun.sh)"

  . BUILD/autorun.sh

fi



# configure

./configure $base_configs $extra_configs

netware/BUILD/mwenv

+6 −0
Original line number Diff line number Diff line
@@ -65,5 +65,11 @@ then 
  export TERM=linux

fi



# Temporary hack to allow building from source dist

if [ "$USER"=pushbuild ]

then

  export ARFLAGS=$AR_FLAGS

fi



# Print all env. variables

export

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