Docs/manual.texi:
  misc. minor corrections

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

Removed compiler warnings.


Build-tools/Do-compile:
  Simple cleanup
include/mysql.h:
  Use #include "" instead of include <>
mysql-test/t/innodb_handler.test:
  Documented test
  Change to be runnable from mysql
sql/mini_client.cc:
  Removed dead code
sql/mysqld.cc:
  Changed relay_log_space to ulonglong
sql/slave.cc:
  Changed relay_log_space to ulonglong
  Removed dead code
sql/slave.h:
  Changed relay_log_space to ulonglong
sql/sql_acl.cc:
  Removed not used variables
sql/sql_base.cc:
  Removed not used variables
sql/sql_cache.cc:
  Removed not used variables
sql/sql_select.cc:
  Removed not used variables
vio/vio.c:
  Re-order include files to remove compiler warnings

Docs/manual.texi:
  Changelog

Docs/manual.texi:
  Auto merged

Fix when using --localstatedir
Cleaned up mysql.server


Build-tools/Do-compile:
  Remove test file timestamp2
Docs/manual.texi:
  Changelog
client/mysqladmin.c:
  Portability fix
scripts/make_binary_distribution.sh:
  Fix for mysql.server
sql/mysqld.cc:
  Fix when using --localstatedir
support-files/mysql.server.sh:
  More comments for usage of 'basedir'

in shutdown operation.

client/mysqladmin.c:
  Cleanup of waiting for pidfile.

Changed option variables to my_bool (to avoid bugs in my_getopt())
Added new thread specific mutex LOCK_delete to be able to free LOCK_thread_count early.
Changed usage of LOCK_thread_count -> LOCK_status for statistics variables


libmysqld/lib_sql.cc:
  Removed not needed LOCK
mysql-test/mysql-test-run.sh:
  Log name of running test
mysql-test/r/rpl_sporadic_master.result:
  Cleaned up test
mysql-test/t/rpl_sporadic_master.test:
  cleaned up test
sql/log.cc:
  Cleanup.
  Fixed bug in wait_for_update() that I had introduced.
sql/mini_client.cc:
  Indentation changes.
sql/mysql_priv.h:
  Changed option variables to my_bool.
sql/mysqld.cc:
  Changed option variables to my_bool.
  Removed not used LOCK_server_id
  Minor code cleanups.
sql/repl_failsafe.cc:
  Minor code cleanups
sql/slave.cc:
  Minor code cleanups.
  Fixed usage of wait_for_update().
sql/slave.h:
  Changed option variables to my_bool.
sql/sql_class.cc:
  Added new thread specific mutex LOCK_delete to be able to free LOCK_thread_count early
sql/sql_class.h:
  Added new thread specific mutex LOCK_delete to be able to free LOCK_thread_count early
sql/sql_insert.cc:
  Do broadcast after unlock()
sql/sql_parse.cc:
  Removed not needed LOCK
  Changed usage of LOCK_thread_count -> LOCK_status for statistics variables
  Changed killing of threads to not lock LOCK_thread_count for long.
sql/sql_repl.cc:
  Changed options variables to my_bool
  Fixed usage of wait_for_update()
  Fixed loop to kill slaves to not lock LOCK_thread_count for long.
  Code optimization.
sql/sql_repl.h:
  bool -> my_bool
  Fixed KICK_SLAVE to use LOCK_delete

  The lexer of InnoDB to 8-bit, it was 7-bit which made it crash on table names containing char codes > 127
pars0lex.l, pars0grm.y:
  Add InnoDB internal SQL interpreter grammar and lexer sources


innobase/pars/pars0grm.y:
  Add InnoDB internal SQL interpreter grammar and lexer sources
innobase/pars/pars0lex.l:
  Add InnoDB internal SQL interpreter grammar and lexer sources
innobase/pars/lexyy.c:
  The lexer of InnoDB to 8-bit, it was 7-bit which made it crash on table names containing char codes > 127
innobase/pars/pars0grm.c:
  The lexer of InnoDB to 8-bit, it was 7-bit which made it crash on table names containing char codes > 127
innobase/pars/pars0grm.h:
  The lexer of InnoDB to 8-bit, it was 7-bit which made it crash on table names containing char codes > 127
innobase/include/pars0grm.h:
  The lexer of InnoDB to 8-bit, it was 7-bit which made it crash on table names containing char codes > 127

  Remove a spurious deadlock when >= 2 insert transactions have to wait because there is a next-key lock set


innobase/lock/lock0lock.c:
  Remove a spurious deadlock when >= 2 insert transactions have to wait because there is a next-key lock set
innobase/include/lock0lock.h:
  Remove a spurious deadlock when >= 2 insert transactions have to wait because there is a next-key lock set

DROP: delete, ALTER: change, column: field.

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

pid file to disappear, when MySQL was already re-started.

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

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

mysql-test/r/innodb.result:
  remove handler test from innodb.test
mysql-test/t/innodb.test:
  remove handler test from innodb.test
sql/ha_innodb.cc:
  HANDLER support
sql/ha_innodb.h:
  HANDLER support
sql/handler.h:
  HANDLER support for InnoDB
sql/sql_handler.cc:
  HANDLER support for InnoDB

mysys/thr_alarm.c:
  Fixed portability problem with thr_alarm.c
readline/display.c:
  Removed compiler warning
sql/net_serv.cc:
  Added DBUG_ENTER in net_clear.

More DBUG info for replication
Better error messages from replication
Fixed bug in replication code when connecting to 'localhost' (time was not released properly)
Block ALARM signal on Linux for signal handler thread (Fixes problem with running mysqld with --debug)
Removed warning when setting an AUTO_INCREMENT field to NULL


Build-tools/Do-compile:
  Always run test with --warnings during build
Docs/manual.texi:
  Changelog
configure.in:
  Use our version of RWLOCKS on UNIXWARE 7
include/my_pthread.h:
  Use our version of RWLOCKS on UNIXWARE 7
include/mysql_version.h.in:
  Fixed warning when compiling embedded server
include/mysqld_error.h:
  New error messages
libmysql/libmysql.c:
  Give connect error message on reconnect if it fails.
  Fixed possible buffer overflow in expand_error()
  Added error messages for some error conditions.
mysql-test/mysql-test-run.sh:
  Portability fixes:
  - Search after 'time' in path.
  - Search after mysqld in libexec
  - Remove end / when doing rm -r (fix for BSD)
  Clean up skip_test handling.
mysql-test/r/rpl_empty_master_crash.result:
  New results
mysql-test/t/rpl_empty_master_crash.test:
  Extended test
mysys/mf_iocache.c:
  Remember file position on failed read.
mysys/mf_iocache2.c:
  Fixed bug in filelength() call.
mysys/thr_alarm.c:
  Made alarm handling more threadsafe when use with DBUG.
mysys/thr_mutex.c:
  More debug info
sql/log_event.cc:
  More DBUG_PRINT statements.
sql/mini_client.cc:
  Better error reporting on failures.
  Return connect error on reconnect failure (instead of SERVER_GONE_ERROR)
  Fixed critical bug in alarm handling on connect (could leave an alarm event on indefinitely)
sql/mysql_priv.h:
  Fixed arguments to mysql_binlog_send()
sql/mysqld.cc:
  Block ALARM signal on Linux for signal handler thread (Fixes problem with running mysqld with --debug)
sql/net_pkg.cc:
  Removed dead code
sql/net_serv.cc:
  Ensure that last_errno is set in net_real_write()
sql/repl_failsafe.cc:
  Code cleanup.
  Better error handling.
sql/share/czech/errmsg.txt:
  New error messages.
sql/share/danish/errmsg.txt:
  New error messages.
sql/share/dutch/errmsg.txt:
  New error messages.
sql/share/english/errmsg.txt:
  New error messages.
sql/share/estonian/errmsg.txt:
  New error messages.
sql/share/french/errmsg.txt:
  New error messages.
sql/share/german/errmsg.txt:
  New error messages.
sql/share/greek/errmsg.txt:
  New error messages.
sql/share/hungarian/errmsg.txt:
  New error messages.
sql/share/italian/errmsg.txt:
  New error messages.
sql/share/japanese/errmsg.txt:
  New error messages.
sql/share/korean/errmsg.txt:
  New error messages.
sql/share/norwegian-ny/errmsg.txt:
  New error messages.
sql/share/norwegian/errmsg.txt:
  New error messages.
sql/share/polish/errmsg.txt:
  New error messages.
sql/share/portuguese/errmsg.txt:
  New error messages.
mysql-test/r/rpl_log_pos.result:
  Updated results
mysql-test/t/rpl_log_pos.test:
  Added 'sleep' commands to make tests repeatable.
sql/share/romanian/errmsg.txt:
  New error messages.
sql/share/russian/errmsg.txt:
  New error messages.
sql/share/slovak/errmsg.txt:
  New error messages.
sql/share/spanish/errmsg.txt:
  New error messages.
sql/share/swedish/errmsg.txt:
  New error messages.
sql/share/ukrainian/errmsg.txt:
  New error messages.
sql/slave.cc:
  Code optimization and cleanup.
  More DBUG statements.
  Better cleanup if start slave fails.
  Better error messages from 'fetch_master_table'
  Thread safer handling of 'wait_for_pos'
sql/slave.h:
  Better handling of wait_for_pos
sql/sql_load.cc:
  Removed warning when setting an AUTO_INCREMENT field to NULL
sql/sql_parse.cc:
  Fixed calling of function that has changed.
sql/sql_repl.cc:
  More DBUG statements
  Give a proper error number from mysql_binlog_send() so that we know when we have to abort slaves.