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

into sanja.is.com.ua:/home/bell/mysql/mysql-4.0

configure.in:
  Fixed missing comma

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


Docs/manual.texi:
  Auto merged

how it's named on Mac OS X (thanks to Paul DuBois <paul@snake.net> 
for the hint)


BitKeeper/etc/ignore:
  Added mysql-4.0.2-alpha-pc-linux-gnu-i686.tar.gz mysql-4.0.2-alpha.tar.gz mysql-max-4.0.2-alpha-pc-linux-gnu-i686.tar.gz to the ignore list
configure.in:
  Added "gnutar" to AC_CHECK_PROGS(TAR) for MacOS

build scripts work again.


BUILD/compile-pentium-max:
  Added "--with-embedded-server" to have the libmysqld files included
  in the source distribution when using "make dist"
Build-tools/Do-linux-build:
  Only use the "--with-other-libc" parameter, if another libc actually
  exists, since this will also force static linking, which does not work
  together with OpenSSL
Makefile.am:
  Removed hard-coded file name for TAR, let configure do this instead
  (many systems actually ship GNU tar installed as "tar" instead of
  "gtar")
configure.in:
  Added check for GNU tar named "gtar", fall back to "tar" if "gtar"
  was not found (and hope, that it's a GNU tar as well - this should
  probably be checked more properly)
include/Makefile.am:
  Added "my_semaphore.h" to pkginclude_HEADERS since it was missing
  from the distribution
strings/Makefile.am:
  Added "longlong2str.c" since it was missing from the distribution
support-files/mysql.server.sh:
  Added LSB-compatible header info to make init script more portable
support-files/mysql.spec.sh:
  - Use more RPM macros (e.g. infodir, mandir) to make the spec
    file more portable
  - reorganized the installation of documentation files: let RPM
    take care of this
  - reorganized the file list: actually install man pages along
    with the binaries of the respective subpackage
  - don't include libmysqld.a in the devel subpackage as well, if we
    have a special "embedded" subpackage
  - reworked the package descriptions

into fred.bitbike.com:/home/arjen/mysql-4.0

Docs/Support/update-reserved-words.pl:
  Fill last row to full # of columns in reserved words table.
Docs/manual.texi:
  Regenerated reserved words table (also removed trailing spaces).

Change table from 4 columns to 3 (looks better in output).

Manual_style_guidelines.txt	put back item I lost after manual merge.


Docs/Manual_style_guidelines.txt:
  put back item I lost after manual merge.
Docs/manual.texi:
  Change note mods, 4.0.[12].

Docs/Manual_style_guidelines.txt:
  Updated guidelines, mostly identified globals from O'Reilly proofread.
Docs/Support/docbook-fixup.pl:
  Added post-processing for new docbook-prefix preprocessing.
  Shuffled/fixed some other minor stuff.
Docs/Support/make-docbook:
  Include preprocessing before makeinfo.
Docs/manual.texi:
  Processing O'Reilly proofread, including global style changes.
  Watch this one VERY VERY carefully - it's extremely drastic!

Docs/Support/docbook-fixup.pl:
  Shuffled XML/DocBook LINK fixup to before other XREF fixups that might also touch the result.
Docs/Support/update-reserved-words.pl:
  Generate reserved word list in 3 columns instead of 4.
Docs/manual.texi:
  Slightly adjusted table column widths for better printed output.
  Reserved keywords table newly generated with 3 columns instead of 4.

client/mysqldump.c:
  Auto merged

into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.0

client/mysqldump.c:
  Fixed a bug in get_one_option(), --set-variable didn't work right.

into fred.bitbike.com:/home/arjen/mysql-4.0


Docs/manual.texi:
  Auto merged

Docs/Manual_style_guidelines.txt:
  New item for style guidelines

into mysql.com:/my/mysql-4.0

  is supposed to become the central repository for documentation guidelines
- re-fixed wording in configure.in according to Manual style guidelines
  (thanks to Paul for the hint)

Docs/manual.texi:
  Change note mods, 4.0.2.

Docs/manual.texi:
  Auto merged

Fixed slowdown problem on win98
Fixed syntax for ALTER TABLE .. RENAME


Docs/manual.texi:
  changelog
libmysql/libmysql.c:
  Fixed that enable-reads-from-master and repl-parse-query works in option files.
myisam/ft_boolean_search.c:
  Portability fixes
mysys/my_thr_init.c:
  cleanup
sql/sql_base.cc:
  Fixed slowdown problem on win98
sql/sql_delete.cc:
  Removed compiler warnings
sql/sql_insert.cc:
  Removed compiler warnings
sql/sql_update.cc:
  Removed compiler warnings
sql/sql_yacc.yy:
  Fixed syntax for ALTER TABLE .. RENAME
vio/vio.c:
  Added test of OS2
vio/viosocket.c:
  cleanup

Added FIX reminder regarding @multitable in SHOW VARIABLES section.

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


sql/slave.cc:
  Auto merged

Docs/manual.texi:
  disabled query cache note added to changelog
client/mysqldump.c:
  query cache disabled by adding SQL_NO_CACHE;
  buffer for select query command incresed on 512 byte; 
  query command buffer size defined as marco QUERY_LENGTH.

Docs/manual.texi:
  Minor tweaks to SHOW VARIABLES section.