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


BitKeeper/etc/logging_ok:
  auto-union

mysql-test/t/func_encrypt-master.opt:
  added --loose to --des-key-file for mysql-test not to fail w/o ssl
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

mysys/my_getopt.c:
  Added support for --loose-set-variable
sql/mysqld.cc:
  Fixed a bug when compiling with innodb and/or bdb.

into mugatu.spaceapes.com:/home/jcole/bk/mysql-4.0

- Added special option/variable prefix '--loose-' to my_getopt.c


client/mysql.cc:
  Fixed some variable types.
client/mysqladmin.c:
  Fixed some variable types.
client/mysqlcheck.c:
  Fixed some variable types.
client/mysqldump.c:
  Fixed some variable types.
client/mysqlimport.c:
  Fixed some variable types.
client/mysqlshow.c:
  Fixed some variable types.
myisam/myisamchk.c:
  Fixed some variable types.
mysys/my_getopt.c:
  Fixed a bug in noticing whether argument was allowed to option (variable).
  Added support for prefix --loose-option-name
  This will work with options and variables, but not with --set-variable (!)
  --set-variable is depricated and --variable-name=value should be used
  instead. When used, my_getopt will not return error if option/variable
  was not found, but print a warning, do a no-op and continue.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

(--prompt code contributed by Harrison Fisk.)
Made mysql subsection title clear.
Little style cleanups.

BitKeeper/etc/logging_ok:
  auto-union

Docs/manual.texi:
  Update information about libstdc++
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/Manual_style_guidelines.txt:
  Added "full-text" to style doc. Was previously decided, not documented.

manual.texi	Change note mods, 4.0.2.


Docs/manual.texi:
  Clean up some MERGE uses.

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

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

types, migrated mysqld.cc to use my_getopt.


include/my_getopt.h:
  
  Added missing types; GET_INT, GET_UINT, GET_ULONG, GET_ULL
mysys/my_getopt.c:
  - Fixed a bug in processing short options; variable value was set
    wrongly after processing it in get_one_option(), when it needed
    to be done before it.
  - Fixed a bug in setting variable values; if type was OPT_ARG,
    a call without argument destroyed the default value
  - Added functionality for new GET_* types.
sql/mysqld.cc:
  Changed mysqld.cc to use my_getopt.

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].