Docs/manual.texi:
  Changelog and fix of typo

configure.in:
  Auto merged
Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Changelog
configure.in:
  Version update
isam/pack_isam.c:
  Fixed copyright
myisam/mi_cache.c:
  Indentation fixup

into hundin.mysql.fi:/home/heikki/mysql3

  Fix a bug: if buffer pool size > 2 GB on a 32-bit computer, we got an assertion failure because >> acted as a division operator (not as a register shift) for a wrapped-over integer value


innobase/include/buf0buf.ic:
  Fix a bug: if buffer pool size > 2 GB on a 32-bit computer, we got an assertion failure because >> acted as a division operator (not as a register shift) for a wrapped-over integer value

  Crash the server if file flush does not succeed: the database can get corrupt, better to crash it than let it run


innobase/os/os0file.c:
  Crash the server if file flush does not succeed: the database can get corrupt, better to crash it than let it run

  Slave thread is always in an auto-commit state: remove unnecessary tests when we flush master info


sql/slave.cc:
  Slave thread is always in an auto-commit state: remove unnecessary tests when we flush master info

  Initing a mutex with MY_MUTEX_INIT_FAST may relieve thread thrashing on Linux


innobase/os/os0sync.c:
  Initing a mutex with MY_MUTEX_INIT_FAST may relieve thread thrashing on Linux

  Merge 3.23.52


innobase/btr/btr0btr.c:
  Merge 3.23.52
innobase/btr/btr0cur.c:
  Merge 3.23.52
innobase/btr/btr0sea.c:
  Merge 3.23.52
innobase/include/btr0btr.h:
  Merge 3.23.52
innobase/include/btr0cur.h:
  Merge 3.23.52
innobase/include/btr0sea.h:
  Merge 3.23.52
innobase/include/buf0buf.h:
  Merge 3.23.52
innobase/include/buf0rea.h:
  Merge 3.23.52
innobase/include/data0data.h:
  Merge 3.23.52
innobase/include/data0data.ic:
  Merge 3.23.52
innobase/include/log0log.h:
  Merge 3.23.52
innobase/include/log0log.ic:
  Merge 3.23.52
innobase/include/os0file.h:
  Merge 3.23.52
innobase/include/page0page.h:
  Merge 3.23.52
innobase/include/page0page.ic:
  Merge 3.23.52
innobase/include/row0mysql.h:
  Merge 3.23.52
innobase/include/trx0roll.h:
  Merge 3.23.52
innobase/include/trx0sys.h:
  Merge 3.23.52
innobase/include/trx0trx.h:
  Merge 3.23.52
innobase/include/ut0ut.h:
  Merge 3.23.52
innobase/include/univ.i:
  Merge 3.23.52
innobase/include/ut0ut.ic:
  Merge 3.23.52
innobase/buf/buf0buf.c:
  Merge 3.23.52
innobase/buf/buf0rea.c:
  Merge 3.23.52
innobase/data/data0data.c:
  Merge 3.23.52
innobase/dict/dict0crea.c:
  Merge 3.23.52
innobase/dict/dict0dict.c:
  Merge 3.23.52
innobase/dict/dict0load.c:
  Merge 3.23.52
innobase/dict/dict0mem.c:
  Merge 3.23.52
innobase/fsp/fsp0fsp.c:
  Merge 3.23.52
innobase/ibuf/ibuf0ibuf.c:
  Merge 3.23.52
innobase/lock/lock0lock.c:
  Merge 3.23.52
innobase/log/log0log.c:
  Merge 3.23.52
innobase/log/log0recv.c:
  Merge 3.23.52
innobase/mtr/mtr0log.c:
  Merge 3.23.52
innobase/mtr/mtr0mtr.c:
  Merge 3.23.52
innobase/os/os0file.c:
  Merge 3.23.52
innobase/page/page0cur.c:
  Merge 3.23.52
innobase/page/page0page.c:
  Merge 3.23.52
innobase/rem/rem0cmp.c:
  Merge 3.23.52
innobase/row/row0ins.c:
  Merge 3.23.52
innobase/row/row0mysql.c:
  Merge 3.23.52
innobase/row/row0purge.c:
  Merge 3.23.52
innobase/row/row0upd.c:
  Merge 3.23.52
innobase/srv/srv0srv.c:
  Merge 3.23.52
innobase/srv/srv0start.c:
  Merge 3.23.52
innobase/trx/trx0roll.c:
  Merge 3.23.52
innobase/trx/trx0sys.c:
  Merge 3.23.52
innobase/trx/trx0trx.c:
  Merge 3.23.52
innobase/trx/trx0undo.c:
  Merge 3.23.52
innobase/ut/ut0mem.c:
  Merge 3.23.52
innobase/ut/ut0ut.c:
  Merge 3.23.52

  Use current_thd to check if a transaction is done by a slave thread


sql/ha_innobase.cc:
  Use current_thd to check if a transaction is done by a slave thread

  Add syntax SET NO_FOREIGN_KEY_CHECKS=1 and SET RELAXED_UNIQUE_CHECKS=1


sql/lex.h:
  Add syntax SET NO_FOREIGN_KEY_CHECKS=1 and SET RELAXED_UNIQUE_CHECKS=1
sql/mysql_priv.h:
  Add syntax SET NO_FOREIGN_KEY_CHECKS=1 and SET RELAXED_UNIQUE_CHECKS=1
sql/sql_yacc.yy:
  Add syntax SET NO_FOREIGN_KEY_CHECKS=1 and SET RELAXED_UNIQUE_CHECKS=1

  Add option innodb_flush_log_at_trx_commit=2 which means we always write the log to file at commit, but only do fsync about once per second


sql/mysqld.cc:
  Add option innodb_flush_log_at_trx_commit=2 which means we always write the log to file at commit, but only do fsync about once per second

  Merge 3.23.52


sql/ha_innobase.cc:
  Merge 3.23.52

  Add BEGIN andd COMMIT around transactions in the binlog


sql/handler.cc:
  Add BEGIN andd COMMIT around transactions in the binlog
sql/log.cc:
  Add BEGIN andd COMMIT around transactions in the binlog

  Do not flush the position to master.info file if we have a transaction open


sql/slave.cc:
  Do not flush the position to master.info file if we have a transaction open
sql/slave.h:
  Do not flush the position to master.info file if we have a transaction open

configure.in


configure.in:
  Added -DHAVE_BROKEN_REALPATH to the Mac OS X (darwin) compile options
  this reportedly increases the stability under high load

into mysql.com:/my/mysql-3.23

Docs/manual.texi:
  Fixed example
sql/mysqld.cc:
  Cleanup

has finally been released 


configure.in:
  Bump up version number to 3.23.52 now that 3.23.51 is finally out

mysys/my_pthread.c:
  Portability fix
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

header in x86 assemler files instead of eating the whole file


Build-tools/mysql-copyright-2:
  Handle copyright headers in *-x86.s files correctly (they do not
  use C style comments)

Build-tools/Do-linux-build:
  Create debug symbols so make_binary_distribution adds them to the tarball
  as well

added a new replication test


sql/sql_base.cc:
  f

Docs/manual.texi:
  changelog

into nick.leippe.com:/home/nick/mysql/mysql

added respective test case


sql/slave.cc:
  fixed load table from master hang when host is empty

Change TRUNCATE(number) to truncate towards zero for negative numbers
Fix NULL handling for DESCRIBE table_name


Docs/manual.texi:
  Update of TRUNCATE() information
configure.in:
  Fix for HPUX
extra/resolveip.c:
  Fix for SCO
include/my_net.h:
  Fix for HPUX
libmysql/libmysql.c:
  Removed warning on HPUX 10.20
mysql-test/r/func_math.result:
  Test of new TRUNCATE handling
mysql-test/t/func_math.test:
  Test of new TRUNCATE handling
mysys/my_gethostbyname.c:
  Portability fix
sql/item_func.cc:
  Change TRUNCATE(number) to truncate towards zero for negative numbers
sql/sql_show.cc:
  Fix NULL handling for DESCRIBE table_name

This fix should be merged into 4.0 and 4.1

  Fix an assertion failure in ha_innobase.cc about line 302 when a user has used user level locks and closes a connection; this was reported by Jeremy Zawodny


sql/ha_innobase.cc:
  Fix an assertion failure in ha_innobase.cc about line 302 when a user has used user level locks and closes a connection; this was reported by Jeremy Zawodny

Remove end space from ENUM and SET strings


mysql-test/t/type_enum.test:
  Test of end space in enum's
Docs/manual.texi:
  Changelog
include/my_sys.h:
  Renamed stripp_sp -> strip_sp
mysql-test/r/type_enum.result:
  Test of end space in enums
mysys/Makefile.am:
  change stripp_sp -> strip_sp
mysys/mf_strip.c:
  change stripp_sp -> strip_sp
sql/sql_db.cc:
  change stripp_sp -> strip_sp
sql/sql_parse.cc:
  change stripp_sp -> strip_sp
  Remove end space from ENUM and SET strings

Fixed some portability things in my_gethostbyname_r
Portability fix for type_decimal.test


BUILD/SETUP.sh:
  Fixes for gcc 3.1
extra/resolveip.c:
  Cleanup
include/my_net.h:
  Portability fix for SCO
mysql-test/t/type_decimal.test:
  Portability fix for FreeBSD
mysys/Makefile.am:
  Portability fix for OSF1
mysys/raid.cc:
  Portability fix for OSF1

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

into sergbook.mysql.com:/usr/home/serg/Abk/mysql


BitKeeper/etc/logging_ok:
  auto-union
sql/sql_select.cc:
  Auto merged