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

Don't reconnect client on close


libmysql/libmysql.c:
  Don't reconnect on close
mysql-test/r/heap.result:
  Fixed heap table test
sql/field.cc:
  Backed out wrong HEAP table bug fix
sql/ha_heap.h:
  cleanup
sql/mini_client.cc:
  Don't reconnect on close
sql/opt_range.cc:
  Don't use ranges on HEAP tables with LIKE

Docs/manual.texi:
  Did a minor addition to the OS recommendation section.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Fixed bug with float columns



Docs/manual.texi:
  Added new link
client/mysql.cc:
  The environment variable PAGER is now used as the default pager
sql/field.cc:
  Fixed bug with float columns.

    Added a stern warning in a visible (in my opinion) place to make sure
    to compile with -fno-exceptions when using gcc
    Wrote a new paragraphs on OS comparison/choice in the Which OS section



Docs/manual.texi:
  Added a stern warning in a visible (in my opinion) place to make sure
  to compile with -fno-exceptions when using gcc
  Wrote a new paragraphs on OS comparison/choice in the Which OS section
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  Added InnoDB manual in manual.texi

Docs/manual.texi:
  Updated information about BDB tables.
mysql-test/r/heap.result:
  Added test for HEAP bug
mysql-test/t/heap.test:
  Added test for HEAP bug
sql/field.cc:
  Fixed bug with HEAP tables
sql/gen_lex_hash.cc:
  Smallare array

BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Auto merged
support-files/mysql.spec.sh:
  SCCS merged

Docs/manual.texi:
  Moved things in example section.
  Added some links from user comments.

Docs/manual.texi:
  minor wording changes to sections 6.1 - 6.3.

Bug fix for Dec OSF on Alpha.

Minor bug fix for server RPM.
Tweak RPM support for mysqld-max.


configure.in:
  Try to identify FIND_PROC for Cygwin.  Thanks to Pete French
  <pfrench@firstcallgroup.co.uk> for the initial patch.
  
  Add -mieee to C(XX)FLAGS on Dec OSF for alpha, to fix bug w/ floating
  point arithmetic.  Thanks to nick@netability.ie for the heads up.
  
  Don't make mysql-test depend on --with-bench; always build it.  Thanks
  to smurf@play.smurf.noris.de for the patch.
include/global.h:
  Fix #defines if we are using __CYGWIN__.  Thanks to Pete French
  <pfrench@firstcallgroup.co.uk> for the initial patch.
support-files/mysql.spec.sh:
  Change %preun script so that it doesn't shut down mysqld after an
  upgrade.  Thanks to Andy Dustman for the patch.
  
  Add a %post Max script to restart mysqld after upgrading to mysqld-max.

BitKeeper/etc/logging_ok:
  auto-union
mysql-test/mysql-test-run.sh:
  SCCS merged

mysql-test/mysql-test-run.sh:
  use IFS=: instead of tr : " "
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  Added information about mysqld-max
sql/gen_lex_hash.cc:
  Smaller table
support-files/mysql.spec.sh:
  Fix RPM