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.

Docs/manual.texi:
  fix typos

BitKeeper/deleted/.del-rpl_compat.test~5f6ba955e02aa95f:
  deleted old test
Docs/manual.texi:
  Added comment about shared libraries to upgrade section

  Fix a spurious deadlock introduced in the previous fix when next-key locks are requested for a page supremum record


innobase/lock/lock0lock.c:
  Fix a spurious deadlock introduced in the previous fix when next-key locks are requested for a page supremum record

Fixed hang in start_slave_threads() when thread dies quickly.


Docs/manual.texi:
  Changelog
client/mysqltest.c:
  Indentation cleanup
  More DBUG info
libmysql/libmysql.c:
  More DBUG info
  Give better error from reconnect()
mysql-test/r/rpl_rotate_logs.result:
  Update results
mysql-test/t/rpl_log_pos.test:
  Fix for fast machines
mysql-test/t/rpl_rotate_logs.test:
  Updated test to be more portable
scripts/mysql_zap.sh:
  Update for MacOSX
sql/mini_client.cc:
  Better error messages from reconnect.
  Indentation cleanups
sql/slave.cc:
  Fixed hang in start_slave_threads() when thread dies quickly.
sql/slave.h:
  Fixed hang in start_slave_threads() when thread dies quickly.

BitKeeper/etc/ignore:
  auto-union
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/rpl_rotate_logs-master.opt:
  Auto merged
mysql-test/t/rpl_rotate_logs-slave-master-info.opt:
  Auto merged
mysql-test/t/rpl_rotate_logs-slave.sh:
  Auto merged

all free_defaults() on exit in mysql.cc;  Should fix problem with SSL


Docs/manual.texi:
  Added information about --skip-innodb
client/mysql.cc:
  Call free_defaults() on exit
client/mysqladmin.c:
  Call free_defaults() on exit
client/mysqlimport.c:
  Call free_defaults() on exit
mysql-test/r/rpl000016.result:
  Added testing of temporary tables with binary log rotation
mysql-test/t/rpl000016.test:
  Added testing of temporary tables with binary log rotation
sql/log.cc:
  Remove not used variable
sql/sql_class.h:
  Removed wrong mutex lock (hangup in kill on HPUX)

  Port alloca and Windows fix from 3.23


innobase/pars/pars0grm.y:
  Port alloca and Windows fix from 3.23
innobase/pars/pars0grm.c:
  Port alloca and Windows fix from 3.23
innobase/pars/pars0lex.l:
  Port alloca and Windows fix from 3.23
innobase/pars/lexyy.c:
  Port alloca and Windows fix from 3.23

  Eliminate a spurious deadlock when an insert waits for an update and a second update comes to wait after the insert


innobase/lock/lock0lock.c:
  Eliminate a spurious deadlock when an insert waits for an update and a second update comes to wait after the insert

mysql-test/t/rpl_rotate_logs-master.opt:
  Rename: mysql-test/t/rpl000016-master.opt -> mysql-test/t/rpl_rotate_logs-master.opt
mysql-test/t/rpl_rotate_logs-slave.sh:
  Rename: mysql-test/t/rpl000016-slave.sh -> mysql-test/t/rpl_rotate_logs-slave.sh
mysql-test/t/rpl_rotate_logs-slave-master-info.opt:
  Rename: mysql-test/t/rpl000016-slave-master-info.opt -> mysql-test/t/rpl_rotate_logs-slave-master-info.opt
BitKeeper/etc/ignore:
  Added mit-pthreads/include/bits mit-pthreads/include/pthread/machdep.h mit-pthreads/include/pthread/posix.h mit-pthreads/include/sys mit-pthreads/machdep.c mit-pthreads/pg++ mit-pthreads/pgcc sql-bench/innotest1 sql-bench/innotest1a sql-bench/innotest1b sql-bench/innotest2 sql-bench/innotest2a sql-bench/innotest2b to the ignore list
mysql-test/r/rpl_rotate_logs.result:
  Added testing of temporary tables
mysql-test/t/rpl000018.test:
  Commented test
mysql-test/t/rpl_rotate_logs.test:
  Added testing of temporary tables

configure.in:
  Auto merged
Docs/manual.texi:
  Auto merged
sql/mysqld.cc:
  Auto merged
innobase/configure.in:
  merge
mysys/my_pthread.c:
  merge