Commit 7ce67307 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

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


mysql-test/mysql-test-run.sh:
  Auto merged
parents 5a9475cd 3bdac0a0

Docs/Makefile.am

+5 −5
Original line number Diff line number Diff line
@@ -36,22 +36,22 @@ CLEAN_FILES: $(txt_files) 
GT = $(srcdir)/Support/generate-text-files.pl



../INSTALL-SOURCE:	mysql.info $(GT)

	perl -w $(GT) mysql.info "Installing" "Tutorial" > $@

	perl -w $(GT) mysql.info "installing-source" "windows-source-build" > $@



../INSTALL-WIN-SOURCE:	mysql.info $(GT)

	perl -w $(GT) mysql.info "Windows source build" "Post-installation" > $@

	perl -w $(GT) mysql.info "windows-source-build" "post-installation" > $@



# We put the description for the binary installation here so that

# people who download source wont have to see it. It is moved up to

# the toplevel by the script that makes the binary tar files.

INSTALL-BINARY:	mysql.info $(GT)

	perl -w $(GT) mysql.info "Installing binary" "Installing source" > $@

	perl -w $(GT) mysql.info "installing-binary" "installing-source" > $@



../EXCEPTIONS-CLIENT: mysql.info $(GT)

	perl -w $(GT) mysql.info "MySQL FLOSS License Exception" "Function Index" > $@

	perl -w $(GT) mysql.info "mysql-floss-license-exception" "function-index" > $@



../support-files/MacOSX/ReadMe.txt:	mysql.info $(GT)

	perl -w $(GT) mysql.info "Mac OS X installation" "NetWare installation" > $@

	perl -w $(GT) mysql.info "mac-os-x-installation" "netware-installation" > $@



# Don't update the files from bitkeeper

%::SCCS/s.%

Docs/Support/generate-flag-images

deleted100755 → 0
+0 −31
Original line number Diff line number Diff line 
#!/bin/sh



flags=`grep @image mirrors.texi | cut -d" " -f1 | cut -d/ -f2 | tr -d "}" | sort | uniq`



set -x

cd Flags



for c in $flags

do

  # For PNM, to be used later

  giftopnm ../Raw-Flags/$c.gif | pnmscale -xsize 30 > $c-tmp.pnm

  pnmpaste $c-tmp.pnm 1 1 ../Images/flag-background.pnm > $c.pnm

  rm -f $c-tmp.pnm



  # For GIF version

  ppmtogif $c.pnm > $c.gif

  # or cjpeg -optimize -quality 70 -outfile $c.jpg



  # For EPS version

  pnmtops -noturn $c.pnm > $c.eps



  # For PDF version

  ps2pdf $c.eps $c.pdf



  # For text version

  echo -n "" > $c.txt



  # PNM isn't really needed

  rm -f $c.pnm



done

Docs/Support/generate-text-files.pl

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ while (<IN>) 
{

  if ($in)

  {

    if (/Node: $tnode,/)

    if (/Node: $tnode,/ || /\[index/)

    {

      $in = 0;

    }

Makefile.am

+3 −3
Original line number Diff line number Diff line
@@ -101,12 +101,12 @@ tags: 


test:

	cd mysql-test; \

	perl mysql-test-run.pl && perl mysql-test-run.pl --ps-protocol

	./mysql-test-run && ./mysql-test-run --ps-protocol



test-force:

	cd mysql-test; \

	perl mysql-test-run.pl --force ;\

	perl mysql-test-run.pl --ps-protocol --force

	./mysql-test-run --force ;\

	./mysql-test-run --ps-protocol --force



# Don't update the files from bitkeeper

%::SCCS/s.%

configure.in

+3 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ AC_PREREQ(2.50)dnl Minimum Autoconf version required. 
AC_INIT(sql/mysqld.cc)

AC_CANONICAL_SYSTEM

# Don't forget to also update the NDB lines below.

AM_INIT_AUTOMAKE(mysql, 5.0.8-beta)

AM_INIT_AUTOMAKE(mysql, 5.0.9-beta)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -17,7 +17,7 @@ SHARED_LIB_VERSION=14:0:0 
# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=8

NDB_VERSION_BUILD=9

NDB_VERSION_STATUS="beta"



# Set all version vars based on $VERSION. How do we do this more elegant ?
@@ -342,7 +342,7 @@ AC_SUBST(CXXFLAGS) 
AC_SUBST(LD)

AC_SUBST(INSTALL_SCRIPT)



export CC CXX CFLAGS LD LDFLAGS AR

export CC CXX CFLAGS LD LDFLAGS AR ARFLAGS



if test "$GCC" = "yes"

then