into teton.kitebird.com:/home/paul/mysql-4.0


Docs/manual.texi:
  Auto merged

  Update
costarica.txt, costarica.gif, costarica.eps:
  new file


Docs/mirrors.texi:
  Update

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0

accomodate EXPLAIN properly for all possible variant of UNION's
derived tables etc ...

This also fixes all reported (and unreported) bugs when EXPLAIN is
run on UNION's.

select_describe() now has a very dirty hack to avoid some problems
with transactional tables on table unlocking.

Code speedup is possible. For the moment all that was important was
that all tests are passed.

reference manual for O'Reilly.


Docs/Support/docbook-split:
  Give the output directory a more sensible, and automatically generated, name.
Docs/Support/make-docbook:
  Patch shell script to include patching the colspec tags and splitting the manual into it's components.

  Script that takes the relative values in the 
  colspec tags and converts them to absolute values.

changeset - afaik, I can edit changesets with bk. So, rather than wait, I will
commit this now, finish up the other code, try to alter the changeset and then
push all the changes up.


Docs/Support/docbook-fixup.pl:
  Rewrote to use a more native Perl style.
  Increase strictness of error checking.
  Simplified and optimized regular expressions.
  Fixed several problems with conversion. Still have some minor issues to sort out.
  Rewrote to accept input from stdin or from filename arg(s) on the command line.
  Improved speed ~6x.
Docs/Support/docbook-split:
  Rewrote to use a more native Perl style.
  Increase strictness of error checking.
  Simplified and optimized.
  Rewrote to accept input from stdin or from filename arg(s) on the command line.

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0

  Experiment


Docs/manual.de.texi:
  Experiment

  @uref fix-ups
include.de.texi:
  new file


Docs/manual.de.texi:
  @uref fix-ups

  new file

Docs/Support/docbook-fixup.pl:
  Added new regex for XREFs, to have them in correct English-grammar.
  Minor fixup to removed node catcher from earlier change.
Docs/manual.texi:
  Fixup of Texinfo @ref/@xref/@pxref usage in appropriate locations.

into co3064164-a.bitbike.com:/home/arjen/mysql-4.0

into teton.kitebird.com:/home/paul/mysql-4.0


Docs/manual.texi:
  Auto merged

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0

into co3064164-a.bitbike.com:/home/arjen/mysql-4.0

Fixed typo.

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0

Added update about PostgreSQL 7.2 and VACUUM.

into linux.local:/home/zak/bk/mysql-4.0

  Fix typo in a contrib download filename


Docs/manual.texi:
  Fix typo in a contrib download filename

into sarvik.tfr.cafe.ee:/usr/home/tfr/BK/mysql-4.0


Docs/manual.texi:
  Auto merged

Docs/Support/docbook-fixup.pl:
  Series of minor changes to convert the output of makeinfo to well-formed XML
   - Discarded DTD - ORA can add their own appropriate DTD
   - Added required XML PI - included appropriate character encoding information
   - Added missing abstract and bookinfo tags
   - Escaped ampersands in HTML escape sequences to allow validation - need to review
Docs/Support/make-docbook:
  Forced validation of XML document at end of conversion process
  Removed temporary files - set makeinfo output to stdout
BitKeeper/etc/ignore:
  Added Docs/safe-mysql.xml to the ignore list
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

  Remove link to sqlscreens in the contrib section


Docs/manual.texi:
  Remove link to sqlscreens in the contrib section

Docs/manual.texi:
  All lines in @example blocks need to be <76 chars.
  Minor cleanup of other stuff in @example blocks.

Added mention of USE/IGNORE KEY as alias for USE/IGNORE INDEX.
Fixups references to this feature throughout manual.

Docs/manual.texi:
  Added USE INDEX / IGNORE INDEX syntax to table_references info in SELECT.
  Added USE INDEX / IGNORE INDEX to function index.

Docs/Support/docbook-fixup.pl:
  Added fixup for xref closing /> tag to prevent malformed XML.
  Improved /para whitespace removal.
Docs/manual.texi:
  Removed double whitespace in middle of sentence.

sql/sql_parse.cc:
  Auto merged

Docs/manual.texi:
  Added section about LOAD DATA LOCAL
libmysqld/lib_sql.cc:
  Remove not used option
mysql-test/r/comments.result:
  Updated results
sql/sql_parse.cc:
  Fix queries / second