Docs/manual.texi:
  Changelog

  In HP-UX-10.20 my_pthread_mutex_trylock erroneously returned 0 also in the case where the mutex was not acquired


mysys/my_pthread.c:
  In HP-UX-10.20 my_pthread_mutex_trylock erroneously returned 0 also in the case where the mutex was not acquired

  Fix an infinite recursion in my_pthread_mutex_trylock in HP-UX-10.20; the same bug is in the 4.0 tree


mysys/my_pthread.c:
  Fix an infinite recursion in my_pthread_mutex_trylock in HP-UX-10.20; the same bug is in the 4.0 tree

strings/Makefile.am:
  "make clean" should not remove this file, it is generayed by "configure".
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

BitKeeper/deleted/.del-stamp-h.in~d3fb1119ddf3630f:
  Delete: stamp-h.in
BitKeeper/etc/ignore:
  Added stamp-h.in to the ignore list

  Fix a critical portability bug introduced in the Windows version


innobase/os/os0thread.c:
  Fix a critical portability bug introduced in the Windows version
innobase/include/os0thread.h:
  Fix a critical portability bug introduced in the Windows version

  Put a note that the InnoDB HANDLER code is not used until 4.1, and appears for documentational purposes only


sql/ha_innobase.cc:
  Put a note that the InnoDB HANDLER code is not used until 4.1, and appears for documentational purposes only
sql/ha_innobase.h:
  Put a note that the InnoDB HANDLER code is not used until 4.1, and appears for documentational purposes only

  Cleanup of latest rewrite of innobase_mysql_print_thd; from now on changing this code is forbidden unless a written permission is received from Heikki 3 days in advance


sql/ha_innobase.cc:
  Cleanup of latest rewrite of innobase_mysql_print_thd; from now on changing this code is forbidden unless a written permission is received from Heikki 3 days in advance

BitKeeper/etc/config:
  Make my life easier on bk clone/pull.
BitKeeper/triggers/post-commit:
  Little fixes in commit script (from 4.0 script).
  Added docs-commit@ notification for 3.23 (so we can more easily keep an eye on it).
Docs/manual.texi:
  Change/addition for Sinisa.
  Clarification of BDB changelog entry.

sql/mysqld.cc:
  Removed not necessary DBUG line

sql/ha_innobase.cc:
  merge (kept my changes to ha_innobase.cc to not use sprintf())

Moved IF(test,column,NULL) code to 4.0
Changed mysys_priv.h to include my_pthread.h or my_no_pthread.h.
Removed some CR's in os2 files.


Docs/manual.texi:
  Changelog
include/global.h:
  Fix for BIGINT problem on AIX
include/my_no_pthread.h:
  Fixed typo
libmysql/Makefile.shared:
  Fix for BIGINT problem on AIX
mysql-test/mysql-test-run.sh:
  Fix to find xterm on AIX 4.3
mysql-test/r/bigint.result:
  Fix for BIGINT problem on AIX
mysql-test/r/func_if.result:
  Change results for IF() after reverting change.
mysql-test/t/bigint.test:
  Fix for BIGINT problem on AIX
mysys/Makefile.am:
  Fix for BIGINT problem on AIX
mysys/my_gethostbyname.c:
  Cleanup
mysys/my_init.c:
  Cleanup
mysys/my_net.c:
  Cleanup
mysys/my_os2cond.c:
  Space & CRLF cleanup
mysys/my_os2dirsrch.c:
  Space & CRLF cleanup
mysys/my_os2dirsrch.h:
  Space & CRLF cleanup
mysys/my_os2dlfcn.c:
  Space & CRLF cleanup
mysys/my_os2file64.c:
  Space & CRLF cleanup
mysys/my_os2mutex.c:
  Space & CRLF cleanup
mysys/my_os2thread.c:
  Space & CRLF cleanup
mysys/my_os2tls.c:
  Space & CRLF cleanup
mysys/mysys_priv.h:
  cleanup
mysys/thr_rwlock.c:
  cleanup
sql/ha_innobase.cc:
  Removed usage of sprintf()
  Fixed missing end \0 which caused control characters to appear in SHOW INNODB STATUS
sql/item_cmpfunc.cc:
  Reverted change for IF()
sql/mysqld.cc:
  Fix for shutdown on AIX

  Add tentative code which can be used in HANDLER implementation for InnoDB


sql/ha_innobase.h:
  Add tentative code which can be used in HANDLER implementation for InnoDB
sql/ha_innobase.cc:
  Add tentative code which can be used in HANDLER implementation for InnoDB
innobase/trx/trx0trx.c:
  Add tentative code which can be used in HANDLER implementation for InnoDB
innobase/include/trx0trx.h:
  Add tentative code which can be used in HANDLER implementation for InnoDB

  Redefine sprintf as ut_sprintf inside InnoDB code; some old Unixes may have a pointer as the return type of sprintf
lock0lock.c:
  Add safety against buffer overruns in latest deadlock info
srv0srv.c:
  Add safety against buffer overruns in SHOW INNODB STATUS
os0thread.h, os0thread.c:
  Fix a portability bug introduced in Windows when we changed os_thread_id_t to be the same as os_thread_t


innobase/os/os0thread.c:
  Fix a portability bug introduced in Windows when we changed os_thread_id_t to be the same as os_thread_t
innobase/include/os0thread.h:
  Fix a portability bug introduced in Windows when we changed os_thread_id_t to be the same as os_thread_t
innobase/srv/srv0srv.c:
  Add safety against buffer overruns in SHOW INNODB STATUS
innobase/lock/lock0lock.c:
  Add safety against buffer overruns in latest deadlock info
innobase/include/ut0ut.h:
  Redefine sprintf as ut_sprintf inside InnoDB code; some old Unixes may have a pointer as the return type of sprintf
innobase/include/univ.i:
  Redefine sprintf as ut_sprintf inside InnoDB code; some old Unixes may have a pointer as the return type of sprintf
innobase/ut/ut0ut.c:
  Redefine sprintf as ut_sprintf inside InnoDB code; some old Unixes may have a pointer as the return type of sprintf
sql/ha_innobase.cc:
  Redefine sprintf as ut_sprintf inside InnoDB code; some old Unixes may have a pointer as the return type of sprintf

into sinisa.nasamreza.org:/mnt/work/mysql


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  removing lines that do not follow texi rules correctly.
  Hope Arjen can put this together properly ...

and removed the 3.23.53 News section for now until 3.23.52 is officially
tagged.


Docs/manual.texi:
  Moved this changelog entry into the 3.23.52 section and removed the
  3.23.53 News section for now until 3.23.52 is officially tagged.

 - Only define alloca as a compiler builtin, if we use GCC and there
   is no alloca.h installed


include/my_sys.h:
   - Only define alloca as a compiler builtin, if we use GCC and there
     is no alloca.h installed

  Add some more safety margin to buffer sizes in prints


innobase/trx/trx0trx.c:
  Add some more safety margin to buffer sizes in prints
innobase/lock/lock0lock.c:
  Add some more safety margin to buffer sizes in prints
innobase/include/trx0trx.h:
  Add some more safety margin to buffer sizes in prints
sql/ha_innobase.cc:
  Add some more safety margin to buffer sizes in prints

  Found the bug in modified innobase_mysqld_print_thd; the person who modifies code should test that his change works


sql/ha_innobase.cc:
  Found the bug in modified innobase_mysqld_print_thd; the person who modifies code should test that his change works

  Revert changes to sprintf until we know why control characters scrambled the output


sql/ha_innobase.cc:
  Revert changes to sprintf until we know why control characters scrambled the output

include/my_sys.h:
  Removed redefine of alloca with GCC

Remove not needed locks in SHOW OPEN TABLES


sql/ha_innobase.cc:
  Reverted Heikkis patch as his was not portable.
sql/sql_show.cc:
  Remove not needed locks in SHOW OPEN TABLES

   compiler builtin when using gcc


include/my_sys.h:
   - Portability fix: define alloca as a compiler builtin on systems
     that have gcc but no alloca.h (e.g. some IBM AIX flavors), use
     "#pragma alloca" when using IBMs compiler (xlr_C)

  Merge InnoDB-3.23.52d


innobase/btr/btr0sea.c:
  Merge InnoDB-3.23.52d
innobase/buf/buf0buf.c:
  Merge InnoDB-3.23.52d
innobase/buf/buf0lru.c:
  Merge InnoDB-3.23.52d
innobase/include/buf0buf.h:
  Merge InnoDB-3.23.52d
innobase/include/ha0ha.h:
  Merge InnoDB-3.23.52d
innobase/include/log0log.h:
  Merge InnoDB-3.23.52d
innobase/include/os0file.h:
  Merge InnoDB-3.23.52d
innobase/include/os0thread.h:
  Merge InnoDB-3.23.52d
innobase/include/ha0ha.ic:
  Merge InnoDB-3.23.52d
innobase/include/os0sync.ic:
  Merge InnoDB-3.23.52d
innobase/include/srv0start.h:
  Merge InnoDB-3.23.52d
innobase/include/sync0rw.ic:
  Merge InnoDB-3.23.52d
innobase/include/sync0sync.ic:
  Merge InnoDB-3.23.52d
innobase/include/ut0dbg.h:
  Merge InnoDB-3.23.52d
innobase/include/univ.i:
  Merge InnoDB-3.23.52d
innobase/lock/lock0lock.c:
  Merge InnoDB-3.23.52d
innobase/log/log0log.c:
  Merge InnoDB-3.23.52d
innobase/mem/mem0pool.c:
  Merge InnoDB-3.23.52d
innobase/os/os0file.c:
  Merge InnoDB-3.23.52d
innobase/os/os0thread.c:
  Merge InnoDB-3.23.52d
innobase/srv/srv0srv.c:
  Merge InnoDB-3.23.52d
innobase/srv/srv0start.c:
  Merge InnoDB-3.23.52d
innobase/sync/sync0arr.c:
  Merge InnoDB-3.23.52d
innobase/sync/sync0rw.c:
  Merge InnoDB-3.23.52d
innobase/sync/sync0sync.c:
  Merge InnoDB-3.23.52d
innobase/thr/thr0loc.c:
  Merge InnoDB-3.23.52d
innobase/trx/trx0trx.c:
  Merge InnoDB-3.23.52d
innobase/configure.in:
  Merge InnoDB-3.23.52d
sql/ha_innobase.cc:
  Merge InnoDB-3.23.52d

Fixed bug in automatic repair of MyISAM tables where table cache was not locked properly


Docs/manual.texi:
  Changelog
libmysql/Makefile.am:
  Fixed problem with make distcheck
libmysql/Makefile.shared:
  Fixed problem with make distcheck
sql/sql_base.cc:
  Fixed bug in automatic repair where table cache was not locked properly.
strings/Makefile.am:
  Fixed problem with make distcheck

Removed Heikki's patch for handling this.

Added option --host to mysqlhotcopy


mysql-test/mysql-test-run.sh:
  Added error message if the server doesn't start.
  Increase connect timeout a bit (for running under purify).
mysql-test/t/rpl000001.test:
  Longer sleep time (for running under purify)
scripts/mysqlhotcopy.sh:
  Added option --host for usage with TCP/IP connections
sql/gen_lex_hash.cc:
  Fixed typo