Commit c28988e7 authored by serg@infomag.ape.relarn.ru's avatar serg@infomag.ape.relarn.ru
Browse files

Merge serg@work.mysql.com:/home/bk/mysql 

into infomag.ape.relarn.ru:/usr/home/serg/src/mysql.safe/bk/mysql
parents 7b026ca7 45e5207b

Build-tools/Do-all-build-steps

+5 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ EXTRA_CONFIG="--without-perl" 
echo "Building on $to_host"



rm -rf $BD/*

rm -f $WD/binary/*

mkdir -p $WD/Logs

mkdir -p $BD/Logs
@@ -86,3 +87,7 @@ fi 
cd "$BD"

DIST=`ls -t mysql-*.tar.gz | head -1`

$BD/Build-tools/mysql-copyright --target=. $DIST



# move the binaries to the 'binary' directory

mv $BD/mysql*tar.gz $WD/binary

mv $BD/NEW-RPMS/* $WD/binary

Build-tools/Do-compile

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ if ($opt_stage == 0) 
  system("mkdir $host/test") if (! -d "$host/test");

  system("mkdir $host/bin") if (! -d "$host/bin");

  system("mkdir Logs") if (! -d "Logs");

  system("mv $log ${log}-old") if (-f $log);

  unlink($log);

}

Docs/manual.texi

+2 −0
Original line number Diff line number Diff line
@@ -28286,6 +28286,8 @@ aren't specified. 
You should have a primary key in the table.

@item

You should have a timestamp in all tables you want to be able to update.

For maximum portability @code{TIMESTAMP(14)} or simple @code{TIMESTAMP}

is recommended instead of other @code{TIMESTAMP(X)} variations.

@item

Only use double float fields. Access fails when comparing with single floats.

@item

acconfig.h

+3 −0
Original line number Diff line number Diff line
@@ -50,6 +50,9 @@ 
/* READLINE: */

#undef HAVE_BSD_SIGNALS



/* ZLIB and compress: */

#undef HAVE_COMPRESS



/* Define if we are using OSF1 DEC threads */

#undef HAVE_DEC_THREADS

acinclude.m4

+19 −0
Original line number Diff line number Diff line
@@ -116,6 +116,25 @@ then 
fi

])



AC_DEFUN(MYSQL_CHECK_ZLIB_WITH_COMPRESS, [

save_LIBS="$LIBS"

LIBS="-l$1 $LIBS"

AC_CACHE_CHECK([if libz with compress], mysql_cv_compress,

[AC_TRY_LINK([#include <zlib.h>

#ifdef __cplusplus

extern "C"

#endif

],

[ return compress(0, (unsigned long*) 0, "", 0);

], mysql_cv_compress=yes, mysql_cv_compress=no)])

if test "$mysql_cv_compress" = "yes"

then

  AC_DEFINE(HAVE_COMPRESS)

else

  LIBS="$save_LIBS"

fi

])



#---START: Used in for client configure

AC_DEFUN(MYSQL_CHECK_ULONG,

[AC_MSG_CHECKING(for type ulong)