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

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 

into  linux.site:/home/marty/MySQL/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysys/default.c:
  Auto merged
ndb/include/transporter/TransporterDefinitions.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
parents fd34694d 9996c3d8

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -1116,3 +1116,4 @@ vio/test-ssl 
vio/test-sslclient

vio/test-sslserver

vio/viotest-ssl

ndb/src/dummy.cpp

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ mysqldev@melody.local 
mysqldev@mysql.com

mysqldev@o2k.irixworld.net

ndbdev@dl145b.mysql.com

ndbdev@dl145c.mysql.com

ndbdev@eel.hemma.oreland.se

ndbdev@ndbmaster.mysql.com

ndbdev@shark.

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;

    }