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

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

  Little fixups.


Docs/manual.texi:
  Little fixups.

  Auch typo fix (tnx Paul!)


Docs/manual.texi:
  Auch typo fix (tnx Paul!)

  Fixed caps.


Docs/manual.texi:
  Fixed caps.

  Licensing and various other fixups (Zak & Arjen).


Docs/manual.texi:
  Licensing and various other fixups (Zak & Arjen).

  Translated new error message to Dutch.


sql/share/dutch/errmsg.txt:
  Translated new error message to Dutch.

  Multitable column fixups remainder: ch.4-9, all appendices.
  Fixed a few minor formatting errors.


Docs/manual.texi:
  Multitable column fixups remainder: ch.4-9, all appendices.
  Fixed a few minor formatting errors.

  multitable column fractions fixed ch.1-3 (for O'Reilly).


Docs/manual.texi:
  multitable column fractions fixed ch.1-3 (for O'Reilly).

  @Node name change Parenthesis -> Parentheses (from Paul DuBois)


Docs/manual.de.texi:
  @Node name change Parenthesis -> Parentheses (from Paul DuBois)
Docs/manual.texi:
  @Node name change Parenthesis -> Parentheses (from Paul DuBois)

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

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


Docs/manual.texi:
  Auto merged

manual.texi	modify a few @xref{}s.
manual.texi	missing @code{}.


Docs/manual.texi:
  Change note mods, 3.22.27 and below.

  Text cleanup (by Colin Faber).


Docs/manual.texi:
  Text cleanup (by Colin Faber).

  Logging to logging@openlogging.org accepted
manual.texi:
  'migration' not a keyword.


Docs/manual.texi:
  'migration' not a keyword.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

fixed compilation problem on FreeBSD
added test for truncating temporary tables


mysql-test/r/truncate.result:
  truncate test
mysql-test/t/truncate.test:
  truncate test update
mysys/safemalloc.c:
  fixed FreeBSD compilation problem
sql/sql_delete.cc:
  fixed bug in truncating temporary tables

into mysql.sashanet.com:/reiser-data/mysql-4.0

access to a FreeBSD box, though.


mysys/my_static.h:
  cleanup
mysys/safemalloc.c:
  cleanup
sql/mysqld.cc:
  initialize some safemalloc variables in main()

Docs/manual.texi:
  Removed duplicated item from 4.1 to-do list.

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

accidental push of broken code.


client/mysqladmin.c:
  fixed crash in free_defaults()
libmysql/Makefile.shared:
  added my_getopt to libmysqlclient
mysys/my_getopt.c:
  fixed bug in parsing -O var=val

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


Docs/manual.texi:
  Auto merged

manual.texi	minor tweaks
manual.texi	VARCHAR(0) is legal now.


Docs/manual.texi:
  fix typos, grammar in LOAD DATA LOCAL section

future, in mysqld.cc.


sql/mysqld.cc:
  Added support for SSL. This is just temporary solution
  and will be fixed to use my_getopt, when mysqld.cc is changed.

client/mysql.cc:
  merge
client/mysqldump.c:
  merge
myisam/myisamchk.c:
  merge
mysys/my_getopt.c:
  Fixed a bug with short options when type was GET_BOOL.
  Fixed a bug in my_print_help() function.

developers before pushing my_getopt.


client/mysqladmin.c:
  Auto merged
mysys/my_getopt.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
client/client_priv.h:
  Merged in previous changes for new client_priv.h (my_getopt)

  Update


Docs/mirrors.texi:
  Update

mysqlcheck and myisamchk to use new my_getopt struct.


client/client_priv.h:
  Changes for my_getopt
client/mysql.cc:
  Uses new my_getopt
client/mysqladmin.c:
  Uses new my_getopt
client/mysqlcheck.c:
  Uses new my_getopt
client/mysqldump.c:
  Uses new my_getopt
client/mysqlimport.c:
  Uses new my_getopt
client/mysqlshow.c:
  Uses new my_getopt
include/my_getopt.h:
  Added GET_BOOL type
include/sslopt-case.h:
  This is shouldn't be needed anymore.
include/sslopt-longopts.h:
  Uses new my_getopt
myisam/myisamchk.c:
  Uses new my_getopt
mysys/my_getopt.c:
  Some bug fixes and small feature adds to my_getopt
sql/mysqld.cc:
  mysqld.cc will be changed next. sslopt-* had to be removed
  temporarily.

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

Docs/manual.texi:
  Auto merged
sql/mysqld.cc:
  Auto merged

BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
readline/Makefile.am:
  Auto merged
sql/convert.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.h:
  Auto merged

Remove not used flag CLIENT_CHANGE_USER


Docs/manual.texi:
  Cleanup examples
acconfig.h:
  Fix for HAVE_QUERY_CACHE
configure.in:
  Fix for HAVE_QUERY_CACHE
include/my_global.h:
  Fix for HAVE_QUERY_CACHE
include/mysql_com.h:
  Remove not used flag CLIENT_CHANGE_USER
libmysqld/libmysqld.c:
  Fix new prototypes