Docs/manual.texi:
  minor mods to recent change notes

Docs/manual.texi:
  New option, -r, to mysqldump. This is needed in MSDOS mode.
client/mysqldump.c:
  Added option -r for MSDOS mode.

client/mysqlcheck.c:
  Added option --autorepair and possibility to change the default
  behavior by changing the executable file name (copy / symlink)

Docs/manual.texi:
  missing @ on @item in contributed software page
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  Updated mysqld-max section
acinclude.m4:
  Portability fix
include/m_ctype.h:
  Portability fix
innobase/configure.in:
  Portability fix

Docs/manual.texi:
  new links
scripts/make_binary_distribution.sh:
  Added missing files
sql/sql_select.cc:
  Added accidently removed line

Changed 'lib' to 'master-data'
Fix for slow slaves


Docs/manual.texi:
  Changelog
include/mysql.h:
  Fixes for Cygwin
libmysql/libmysql.c:
  Fixes for Cygwin
mysql-test/Makefile.am:
  Include missing test files
mysql-test/include/master-slave.inc:
  Fixes for slow slaves
mysql-test/install_test_db.sh:
  Change 'lib' to 'master-data'
mysql-test/mysql-test-run.sh:
  Change 'lib' to 'master-data'
mysql-test/r/group_by.result:
  Test case for count(*) problem
mysql-test/t/group_by.test:
  Test case for count(*) problem
mysql-test/t/rpl000018-master.sh:
  Change 'lib' to 'master-data'
sql/sql_select.cc:
  Fix for count(*) problem

Docs/manual.texi:
  Updated TODO
client/mysqlcheck.c:
  Fixed portability problems
mysql-test/r/backup.result:
  Fixed output after format change for BACKUP TABLE
sql/ha_berkeley.cc:
  Added missing variable
sql/opt_range.cc:
  Small optimization when calculating key blocks

BitKeeper/etc/ignore:
  Added client/mysqlcheck to the ignore list
Docs/manual.texi:
  Changelog

Docs/manual.texi:
  Auto merged

BitKeeper/deleted/.del-compile-ia64-O0-sgicc~a4e0732013d6b602:
  Delete: BUILD/compile-ia64-O0-sgicc
BitKeeper/deleted/.del-compile-ia64-O0~3a41dfebefc817d1:
  Delete: BUILD/compile-ia64-O0
BitKeeper/deleted/.del-compile-ia64-O2-sgicc~6ff796ecac337849:
  Delete: BUILD/compile-ia64-O2-sgicc
BitKeeper/deleted/.del-compile-ia64-O2~87d13594c3599830:
  Delete: BUILD/compile-ia64-O2
BitKeeper/deleted/.del-compile-ia64-O6~c34e6b943b12c468:
  Delete: BUILD/compile-ia64-O6
Docs/manual.texi:
  Cleanup
mysql-test/r/rpl000014.result:
  Change port number for comparison
mysql-test/r/rpl000015.result:
  Change port number for comparison
mysql-test/r/rpl000016.result:
  Change port number for comparison
mysql-test/t/rpl000014.test:
  Change port number for comparison
mysql-test/t/rpl000015.test:
  Change port number for comparison
mysql-test/t/rpl000016.test:
  Change port number for comparison
sql-bench/Results/ATIS-mysql-NT_4.0:
  New test results
sql-bench/Results/RUN-mysql-NT_4.0:
  New test results
sql-bench/Results/alter-table-mysql-NT_4.0:
  New test results
sql-bench/Results/big-tables-mysql-NT_4.0:
  New test results
sql-bench/Results/connect-mysql-NT_4.0:
  New test results
sql-bench/Results/create-mysql-NT_4.0:
  New test results
sql-bench/Results/insert-mysql-NT_4.0:
  New test results
sql-bench/Results/select-mysql-NT_4.0:
  New test results
sql-bench/Results/wisconsin-mysql-NT_4.0:
  New test results
sql/slave.cc:
  Removed not used variable

Docs/manual.texi:
  Updated some old information.
client/Makefile.am:
  mysqlcheck added.

BitKeeper/deleted/.del-mysqlcheck~363e3278166d84ec:
  Delete: client/mysqlcheck
client/mysqlcheck.c:
  New client mysqlcheck.c. Previously mistakenly added mysqlcheck
  script has been removed from the bk tree.

BitKeeper/etc/logging_ok:
  auto-union

CHECK, REPAIR, ANALYZE and OPTIMIZE instead of myisamchk, when
MySQL server is running. Documentation to MySQL manual will follow
shortly.


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

BitKeeper/etc/ignore:
  added mysql.proj

BitKeeper/deleted/.del-ib_config.h.in~9e57db8504e55b7:
  Delete: innobase/ib_config.h.in
BitKeeper/deleted/.del-ib_config.h~7539e26ffc614439:
  Delete: innobase/ib_config.h
Docs/manual.texi:
  Changelog
myisam/mi_locking.c:
  Cleanup
mysql-test/r/bdb.result:
  Test for LOCK TABLES
mysql-test/r/innodb.result:
  Test for LOCK TABLES
mysql-test/t/bdb.test:
  Test for LOCK TABLES
mysql-test/t/innodb.test:
  Test for LOCK TABLES
sql-bench/test-insert.sh:
  Allow loop to be small
sql/ha_berkeley.cc:
  Fixed bug when using LOCK TABLES with BDB
sql/ha_berkeley.h:
  Fixed bug when using LOCK TABLES with BDB
sql/handler.h:
  Fixed bug when using LOCK TABLES with BDB
sql/sql_base.cc:
  Fixed bug when using LOCK TABLES with BDB
sql/sql_parse.cc:
  UNLOCK TABLES ends transaction
sql/sql_select.cc:
  Fix to not call index_end() twice

innobase/configure.in:
  Removed debug options

Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Updated mysqld-max section
configure.in:
  Version change
innobase/configure.in:
  Don't compile with -g when not using debugging (No optimization on Linux-Alpha)
innobase/ib_config.h.in:
  config file
innobase/ib_config.h:
  config file
innobase/include/que0que.h:
  Can't inline this on SCO
innobase/include/que0que.ic:
  Can't inline this on SCO
innobase/include/sync0sync.h:
  Fix for Mac OS X
innobase/que/que0que.c:
  Added functions that can't be inlined on SCO

Docs/manual.texi:
  Auto merged

into mysql.sashanet.com:/home/sasha/src/bk/mysql

mysql-test/Makefile.am:
  fixed bug in distribution build
scripts/make_binary_distribution.sh:
  fixed bug in the distribution build

Removed test of default master parameter
Don't lock locked tables in REPAIR
Changed optimzation for SELECT * from table,table ORDER BY keypart LIMIT


BitKeeper/deleted/.del-have_default_master.inc~a54c86e65a6c4af:
  Delete: mysql-test/include/have_default_master.inc
BitKeeper/deleted/.del-have_default_master.require~1465255ffdaf82f:
  Delete: mysql-test/r/have_default_master.require
Docs/manual.texi:
  Changelog for 3.23.38
acconfig.h:
  Added test for PTHREAD_YIELD
acinclude.m4:
  Added test for PTHREAD_YIELD
configure.in:
  Added test for PTHREAD_YIELD
innobase/os/os0thread.c:
  Added test for PTHREAD_YIELD
mysql-test/r/lock.result:
  Added test of lock bug
mysql-test/t/lock.test:
  Added test of lock bug
mysql-test/t/rpl000014.test:
  Removed test of default master parameter
mysql-test/t/rpl000015.test:
  Removed test of default master parameter
mysql-test/t/rpl000016.test:
  Removed test of default master parameter
sql/ha_myisam.cc:
  Don't lock locked tables in REPAIR
sql/sql_select.cc:
  Changed optimzation for SELECT * from table,table ORDER BY keypart LIMIT

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

univ.i  	Change pthread_yield to sched_yield
configure.in	Change pthread_yield to sched_yield


innobase/configure.in:
  Change pthread_yield to sched_yield
innobase/include/univ.i:
  Change pthread_yield to sched_yield
innobase/os/os0thread.c:
  Change pthread_yield to sched_yield
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

    fixed typo


client/mysqltest.c:
  fixed typo

    added support for alphanumeric variables - import MASTER_MYPORT and
    SLAVE_MYPORT from the environment
mysql-test/mysql-test-run.sh
    export MASTER_MYPORT and SLAVE_MYPORT for mysqltest
mysql-test/t/rpl000015.test
    use MASTER_MYPORT
mysql-test/t/rpl000016.test
    use MASTER_MYPORT


client/mysqltest.c:
  added support for alphanumeric variables - import MASTER_MYPORT and
  SLAVE_MYPORT from the environment
mysql-test/mysql-test-run.sh:
  export MASTER_MYPORT and SLAVE_MYPORT for mysqltest
mysql-test/t/rpl000015.test:
  use MASTER_MYPORT
mysql-test/t/rpl000016.test:
  use MASTER_MYPORT

client/mysqltest.c:
  Cleanup and bug fixes
mysql-test/t/rpl000001.test:
  Fixed typo
mysql-test/t/rpl000015.test:
  Changed to use table t1

Docs/manual.texi:
  Auto merged

Removed unpredictable test from rpl000001.test


Docs/manual.texi:
  Added some information about table locks
libmysql/Makefile.shared:
  Don't force conf_to_src to be static an all systems
mysql-test/r/rpl000001.result:
  Removed unpredictable test
mysql-test/t/rpl000001.test:
  Removed unpredictable test
scripts/mysql_zap.sh:
  Added --help
strings/ctype-ujis.c:
  Removed warnings

Docs/manual.texi:
  Small fixes.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

scripts/mysql_install_db.sh:
  Fixed typo

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

Fixed rpl000001 to handle the most common mysql-test-run ports.


configure.in:
  Fixed that -ldl is not used for clients
  (The old version breaked when client was compiled staticly)
mysql-test/r/rpl000001.result:
  Fix to handle the most common mysql-test-run ports.
mysql-test/t/rpl000001.test:
  Fix to handle the most common mysql-test-run ports.
mysys/my_alloc.c:
  Extended min block a little to get faster mallocs
scripts/mysql_install_db.sh:
  Fixed bug when using RPM and one had --basedir in my.cnf
sql/Makefile.am:
  Add -ldl to mysqld link line
strings/ctype-ujis.c:
  Remove warnings