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

into narttu.mysql.fi:/my/mysql-4.0


sql/sql_parse.cc:
  Auto merged

Changed some non fatal myisamchk error messages to warnings


myisam/myisamchk.c:
  Change error -> warning
sql/handler.cc:
  Add mutex around keybuff_size usage
sql/mysql_priv.h:
  Indentation update
sql/set_var.cc:
  Add mutex around longlong variable usage
sql/sql_parse.cc:
  Fix mutex handling in SHOW_VARIABLES
sql/sql_show.cc:
  Fix mutex handling in SHOW_VARIABLES

contain max 1280 characters, but sometimes in rare cases when --columns
was used, more than 1280 characters was needed. This is case when a lot
of columns was specified using this option. Raised the max value to 8448,
which should be enough.

   startup item: MySQL (the startup script), StartupItem.Description.plist,
   StartupItem.Info.plist (PKGMaker control files), StartupItem.postinstall
   (post-installation script for the Startup Item package)
 - modified support-files/MacOSX/Makefile.am to include the newly added files
   in the source distribution


BitKeeper/etc/ignore:
  Added scripts/make_win_src_distribution to the ignore list
support-files/MacOSX/Makefile.am:
  - added the Mac OS X StartupItem files to the source distribution

into mashka.mysql.fi:/home/my/mysql-4.0

Fix packet error when using wrong GRANT command


include/config-win.h:
  Changed back to test for HAVE_SETFILEPOINTER instead of operating system
mysql-test/r/grant.result:
  Extra test to catch wrong packet bug
mysql-test/t/grant.test:
  Extra test to catch wrong packet bug
mysys/my_chsize.c:
  Cleanup
sql/opt_range.cc:
  Fix to recent BETWEEN patch
sql/sql_acl.cc:
  Fix packet error when using wrong GRANT command
sql/sql_select.cc:
  Cleanups
  Added not critical out-of-memory check

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

  Add --zip option for finer grain control over what package formats are created
Bootstrap:
  Create both Windows source packages


Build-tools/Bootstrap:
  Create both Windows source packages
scripts/make_win_src_distribution.sh:
  Add --zip option for finer grain control over what package formats are created

  'tools' contains intermediate files


scripts/make_win_src_distribution.sh:
  'tools' contains intermediate files

  Adding *.txt here didn't work well-- infolist.txt is in a path containing spaces


scripts/make_win_src_distribution.sh:
  Adding *.txt here didn't work well-- infolist.txt is in a path containing spaces

  Clean up script, add needed modifications to generate a complete 4.0 Windows source package


scripts/make_win_src_distribution.sh:
  Clean up script, add needed modifications to generate a complete 4.0 Windows source package

into build.mysql.com:/users/gweir/mysql-4.0

into mashka.mysql.fi:/home/my/mysql-4.0


sql/sql_select.cc:
  Auto merged

   command.

Build-tools/Bootstrap:
   - fixed typo

  Copy some previously missed files


scripts/make_win_src_distribution.sh:
  Copy some previously missed files

  Corrections to Bootstrap for --win-dist



Build-tools/Bootstrap:
  Corrections to for --win-dist
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into mysql.com:/space/my/mysql-4.0

   (Do-compile)
 - added mysql.info to the binary distribution files (BUG#1019)
 - heavily reworked the Do-rpm script to be more in line with Do-pkg
 - create a "docs" subdirectory in the binary distribution and moved the
   manual, ChangeLog and mysql.info file into it to unclutter the top
   directory


Build-tools/Do-compile:
   - enable compiling with the embedded server by default (as requested by
     BrianA) - disable it with the "--disable-embedded" compile option.
Build-tools/Do-rpm:
   - replaced the original Shell script with a Perl script, similar to Do-pkg.
     Some more work remains to be done (copying the resulting packages,
     enable using different compile flags and compilers).
scripts/make_binary_distribution.sh:
   - move some docs into a subdirectory "docs" to not clutter the top 
     directory with too many files.
   - added mysql.info info file to the docs dir (BUG#1019)

into mysql.com:/home/wax/mysql/mysql-4.0chsize

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


isam/_search.c:
  Auto merged

myisamchk - don't mark table as crashed if --sort-records=<key> failed because of unappropriate key or read-only table

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

   starting the bootstrap

into mashka.mysql.fi:/home/my/mysql-4.0

Fix possible replication bug with LOAD DATA ... IGNORE LINES #


mysql-test/r/rpl_log.result:
  Test of load data ... ignore # lines
mysql-test/t/rpl_log.test:
  Test of load data ... ignore # lines
sql/log_event.cc:
  Fix replication bug with LOAD DATA ... IGNORE LINES #
  (Note that the code that is probably not executed in 4.0)
sql/sql_parse.cc:
  Indentation fix
sql/sql_select.cc:
  Remove wrong bug fix (all tests passes)
sql/sql_yacc.yy:
  Indentation cleanup

into mysql.com:/home/wax/mysql/mysql-4.0chsize


BitKeeper/etc/logging_ok:
  auto-union

replace HAVE_SETFILEPOINTER with __WIN__



include/config-win.h:
  remove HAVE_SETFILEPOINTER
mysys/my_chsize.c:
  replace HAVE_SETFILEPOINTER with __WIN__
  move __WIN__ section to up

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

removed unused field (now it is in variables)


mysql-test/r/query_cache.result:
  rewritten test using loop
mysql-test/t/query_cache.test:
  rewritten test using loop
sql/sql_class.h:
  removed unused field (now it is in variables)

bugfixes will follow

into build.mysql.com:/users/dlenev/mysql-4.0-certs