Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Changelog
isam/_dbug.c:
  Cleanup
sql/mysqld.cc:
  Cleanup
sql/net_serv.cc:
  Cleanup

manual.texi	is no such function)


Docs/manual.texi:
  fix example that uses INDEX() as function (there
  is no such function)

Docs/manual.texi:
  typo fixes

Docs/manual.texi:
  Fixed wrong reference to --with-thread-safe-client
mysql-test/r/bdb.result:
  New tests
mysql-test/t/bdb.test:
  New tests

Docs/manual.texi:
  Updated section of how to change the socket file.
  Changelog for 3.23.43
include/merge.h:
  Fixed typo
include/my_pthread.h:
  Fixed bug for WIN32
include/myisam.h:
  Fixed typo
include/nisam.h:
  Fixed typo
sql/handler.h:
  Fixed typo
sql/sql_table.cc:
  Fixed typo
sql/unireg.cc:
  F

Docs/manual.texi:
  Updated information about mysql_insert_id()

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

handler.cc	If CREATE TABLE fails for an InnoDB table, do not put the OS error number to the error message, because it is not the cause


sql/handler.cc:
  If CREATE TABLE fails for an InnoDB table, do not put the OS error number to the error message, because it is not the cause

ha_innobase.cc	mean_rec_length was set to a too small value for > 4 GB tables because of a wrong typecast


sql/ha_innobase.cc:
  mean_rec_length was set to a too small value for > 4 GB tables because of a wrong typecast

Optimized remove of key when using internal cursor in BDB tables.


mysql-test/r/bdb.result:
  Test for LOCK bug
mysql-test/t/bdb.test:
  Test for LOCK bug
sql/ha_berkeley.cc:
  Fix bugs when using LOCK TABLES
  Optimized remove of key when using internal cursor
sql/ha_berkeley.h:
  Initilize of changed_rows
sql/lock.cc:
  Fix for BDB tables

Fix DBUG_ASSERT()
Optimization for BDB tables
Fix for BDB under Win98


Docs/manual.texi:
  Removed wrong info
bdb/os_win32/os_rename.c:
  Fix for windows 98
configure.in:
  Better options for MAC OS X
include/dbug.h:
  Fix DBUG_ASSERT()
mysys/thr_lock.c:
  More DBUG messages
sql/ha_berkeley.cc:
  Use cursor in remove_key
sql/lock.cc:
  Fix possible problem when pre-unlocking tables in SELECT
sql/sql_select.cc:
  More DBUG messages
sql/violite.c:
  Fix DBUG messages

Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Added more information to MySQL comparison

  Fix danish mirror contact


Docs/manual.texi:
  Fix danish mirror contact

Docs/manual.texi:
  Added description of C thread functions
sql-bench/test-create.sh:
  Faster --fast option

sql/handler.cc:
  Change the parameter name of default-table-type from INNOBASE to INNODB

libmysql/libmysql.c:
  Remove duplicated define
sql/log_event.cc:
  Portability fix

data0data.c	Fix an assertion failure in rem0rec.c line 195 when a > 8000 byte row is updated and an internally stored field shortened


innobase/data/data0data.c:
  Fix an assertion failure in rem0rec.c line 195 when a > 8000 byte row is updated and an internally stored field shortened

trx0trx.h	Fix slowness of deadlock detection algorithm


innobase/include/trx0trx.h:
  Fix slowness of deadlock detection algorithm
innobase/lock/lock0lock.c:
  Fix slowness of deadlock detection algorithm

  Fix a couple of mirror e-mail addresses


Docs/manual.texi:
  Fix a couple of mirror e-mail addresses

include/my_pthread.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

Fix problem with MyISAM and rows of length 65517-65520


Docs/manual.texi:
  Changelog
include/raid.h:
  Ensure that libmysqlclient doesn't use raid
libmysql/Makefile.am:
  Ensure that libmysqlclient doesn't use raid
libmysql_r/Makefile.am:
  Ensure that libmysqlclient doesn't use raid
myisam/mi_check.c:
  Fix problem with rows of length 65517-65520
myisam/mi_dynrec.c:
  Fix problem with rows of length 65517-65520
mysql-test/r/myisam.result:
  Test for myisam tables with problematic row lengths
mysql-test/t/myisam.test:
  Test for myisam tables with problematic row lengths
sql/log_event.cc:
  Portability fix
strings/ctype-euc_kr.c:
  Portability fix
strings/ctype-sjis.c:
  Portability fix

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

fixed Do-rpm to accept command-line options for easier testing/local
RPM build


BUILD/compile-pentium-max:
  add enable-thread-safe-client
Build-tools/Do-rpm:
  make configurable from command line
support-files/mysql.spec.sh:
  add mysqld.sym and mysqld-max.sym to the RPM

fields (inf,nan,...); should be dumped as "NULL".

Docs/manual.texi:
  Small changes for INNER JOIN
configure.in:
  Use 'mysql' as the default MySQL user
myisam/mi_create.c:
  Test for right create information

sql-bench/test-insert.sh:
  Change IN() test to use LEFT JOIN to be comparable to IN()

Portability fixes


Build-tools/Do-compile:
  Fix for Linux ia64
sql-bench/bench-init.pl.sh:
  Added help function time_fetch_all_rows
sql-bench/test-insert.sh:
  Added testing of IN(value-list)
sql/item_func.cc:
  Cleanup
sql/mysqld.cc:
  Portability fix
sql/stacktrace.c:
  Portability fix

sql/item_func.cc:
  Auto merged

Docs/manual.texi:
  Changelog
sql/sql_insert.cc:
  Fix problem with INSERT DELAYED during shutdown

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