BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Remove some compiler warnings when using VC++
Add InnoDB in normal MySQL binary for windows.


BitKeeper/deleted/.del-lib_load.cc~854092828128d7f9:
  Delete: libmysqld/lib_load.cc
VC++Files/bdb/bdb.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/client/mysql.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/client/mysqladmin.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/client/mysqlclient.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/client/mysqldump.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/client/mysqlimport.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/client/mysqlshow.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/innobase/innobase.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/libmysqld/libmysqld.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/libmysqltest/myTest.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/libmysqltest/mytest.c:
  Removed compiler warning for VC++
VC++Files/mysql.dsw:
  Add Innodb to standard binary
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/mysqlcheck/mysqlcheck.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/mysqlmanager/MySqlManager.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/mysys/mysys.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/pack_isam/pack_isam.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/perror/perror.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/replace/replace.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/sql/mysqld.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/test1/test1.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/thr_insert_test/thr_insert_test.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/thr_test/thr_test.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/vio/vio.dsp:
  Updated VC++ dsp files from windows build machine
sql/item_strfunc.cc:
  Removed compiler warning on VC++
VC++Files/libmysql/libmysql.dsp:
  Updated VC++ dsp files from windows build machine

Build-tools/Do-compile:
   - actually add the with-other-libc option to the config options when set
   - fixed some odd-placed quotation marks in the configure line

into sinisa.nasamreza.org:/mnt/work/mysql-4.0


sql/set_var.cc:
  Auto merged

sql/set_var.cc:
  some small fixes.....

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

Docs/manual.texi:
  minor fix

Docs/manual.texi:
  Some BDB fixups.

sql/mysqld.cc:
  Auto merged

configure.in:
   - Bump up version number to 4.0.4-beta, now that 4.0.3 is released

include/config-win.h:
  Portability fix for windows
include/my_global.h:
  General portability fix
sql/mysqld.cc:
  Portability fix for windows
sql/set_var.cc:
  Portability fix for windows
sql/sql_yacc.yy:
  Portability fix for windows

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


Docs/manual.texi:
  Auto merged

manual.texi	fix minor typo.
manual.texi	make some @code{} -> @file{} changes


Docs/manual.texi:
  minor fixes

* Fixed some spelling/language errors in mysqlcheck
* Added some more information in mysql -client internal help.


Docs/manual.texi:
  Added a note about bug fix in my_getopt to changelog section.
client/mysql.cc:
  Added some information in mysql -client internal help.
client/mysqlcheck.c:
  Fixed some spelling / language errors.
mysys/my_getopt.c:
  Fixed a bug in my_getopt:
  --skip-external-locking didn't work and the same bug affected some
  other similar options. 
  
  After fix it is now possible to use the following:
  
  --external-locking                -> enable
  --external-locking=0              -> disable
  --external-locking=1              -> enable
  --skip-external-locking           -> disable
  --skip-external-locking=0         -> enable
  --skip-external-locking=1         -> disable
  --enable-external-locking         -> enable
  --enable-external-locking=0       -> disable
  --enable-external-locking=1       -> enable
  --skip-external-locking=garbage   -> disable
  --enable-external-locking=garbage -> enable
  
  This works now with all options that are boolean type and which
  name doesn't start with --skip- or --enable-.

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


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  max_bin_log_size -> max_binlog_size

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


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  minor fixes

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


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  --with-extra-charset -> --with-extra-charsets

 - fixed wording of two 4.0 features in manual.texi


Build-tools/Do-compile:
   - Added "--libwrap" to enable building with TCP wrapper support
Docs/manual.texi:
   - Fixed wording of two 4.0 features

manual.texi	Document equivalence of REPAIR ... EXTENDED and
manual.texi	myisamchk --safe-recover.


Docs/manual.texi:
  Fix busted @node for 4.0.3.
  Document equivalence of REPAIR ... EXTENDED and
  myisamchk --safe-recover.

Docs/manual.texi:
  whare -> where

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


Docs/manual.texi:
  Auto merged

manual.texi	undo botched "-specific" to " specific"
manual.texi	some changes to dynamic variable-setting section.


Docs/manual.texi:
  fix agreeement.

manual.texi	misc. small corrections.


Docs/manual.texi:
  add dashes to "-specific" constructs

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

 - Added 4.0.4 News section and updated Alpha-Linux compilation notes
   to manual.texi
 - Tagged ChangeSet 1.1244.1.2 as mysql-4.0.3


Build-tools/Do-compile:
   - Added --raid option to be able to build with MySQL RAID suppo
Docs/manual.texi:
   - Updated compilation notes on Alpha-Linux
   - Added 4.0.4 News section
   - Added note about Sinisa's last fix (mostly only to have an item in the
     news section)

sql/mysqld.cc:
  Fix typo
sql/slave.cc:
  Removed unreferenced local variable
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into sinisa.nasamreza.org:/mnt/work/mysql-4.0

B-Tree explanation fix (from Peter Zaitsev).

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

Docs/manual.texi:
  misc. minor corrections

Fixed hangup problem in net_clear() on HPUX and Windows. 


Build-tools/Do-compile:
  Added --bdb-max-lock=60000 option when testing BDB tables.
configure.in:
  Fix for HPUX to not use -lc_r library.
vio/viosocket.c:
  Fixed hangup problem in net_clear() on HPUX and Windows.