BitKeeper/etc/config:
  Auto merged
Docs/manual.texi:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged

able delay_key_write as default (as it was in 4.0.2)


Docs/manual.texi:
  Updated information about variable DELAY_KEY_WRITE.
mysql-test/r/type_decimal.result:
  Updated results
mysql-test/r/variables.result:
  Updated results
mysql-test/t/type_decimal.test:
  Fixed test to not cause purify error in mathlib during purify.
mysql-test/t/variables.test:
  Test new usage of DELAY_KEY_WRITE
sql/ha_innodb.cc:
  Merge with 3.23 code
sql/mysql_priv.h:
  Changed SQL variable delay_key_write to an enum
sql/mysqld.cc:
  Changed SQL variable delay_key_write to an enum.
  Enable delay_key_write as default (as it was in 4.0.2)
sql/set_var.cc:
  Changed SQL variable delay_key_write to an enum
sql/set_var.h:
  Changed SQL variable delay_key_write to an enum
sql/sql_class.h:
  Changed SQL variable delay_key_write to an enum
sql/sql_yacc.yy:
  Changed SQL variable delay_key_write to an enum

  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

Docs/manual.texi:
  SCCS merged

  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.

manual.texi	Add entry for QUOTE() function.


Docs/manual.texi:
  add change note for QUOTE().

mysql-test/r/func_if.result:
  Fixed results after merge
sql/ha_innodb.cc:
  fixed typo after merge

sql/mysqld.cc:
  Removed not necessary DBUG line

BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
  Auto merged
Docs/manual.texi:
  Auto merged
include/my_no_pthread.h:
  Auto merged
innobase/include/univ.i:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/os/os0thread.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/ut/ut0ut.c:
  Auto merged
mysql-test/r/bigint.result:
  Auto merged
mysql-test/t/bigint.test:
  Auto merged
mysys/my_init.c:
  Auto merged
mysys/my_net.c:
  Auto merged
mysys/mysys_priv.h:
  Auto merged
mysys/thr_rwlock.c:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
include/my_sys.h:
  merge with 3.23
libmysql/Makefile.shared:
  merge with 3.23
mysql-test/mysql-test-run.sh:
  merge with 3.23
mysql-test/r/func_if.result:
  merge with 3.23
mysys/Makefile.am:
  merge with 3.23
mysys/my_gethostbyname.c:
  merge with 3.23
sql/ha_innodb.cc:
  merge with 3.23
sql/item_cmpfunc.cc:
  merge with 3.23
sql/mysqld.cc:
  merge with 3.23
sql/sql_show.cc:
  merge with 3.23

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

Fixed some windows portability problems and removed some compiler warnings
 Cleaned up QUOTE() function and fixed bug in \0 and \Z handling.


Docs/manual.texi:
  Changelog
  Added information about new IF() behaviour.
libmysql/libmysql.def:
  Removed mysql_ssl_clear
myisam/mi_dynrec.c:
  Minor cleanup
mysql-test/r/func_str.result:
  Added more tests for QUOTE
mysql-test/t/func_str.test:
  Added more tests for QUOTE
mysys/mf_iocache.c:
  Removed compiler warnings
sql/ha_innodb.cc:
  Added missing null to generated string.
sql/item_cmpfunc.cc:
  Changed IF(expr, column, NULL) to take type from column
sql/item_strfunc.cc:
  Cleaned up QUOTE() function and fixed bug in \0 and \Z handling.
sql/log.cc:
  Minor cleanup
sql/mysql_priv.h:
  Fixed problem with opt_enable_named_pipe
sql/mysqld.cc:
  Fixed problem with opt_enable_named_pipe
  Fixed some syntax errors in windows code
sql/set_var.cc:
  Removed compiler warnings
sql/slave.cc:
  Removed compiler warnings
sql/sql_show.cc:
  Removed compiler warnings

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 teton.kitebird.com:/home/paul/mysql-4.0

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 ...

mysql-test/r/func_str.result:
  cleanup
sql/item_strfunc.cc:
  cleanup

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

Docs/manual.texi:
  BDB log files have 10 digit extension, not 6.

into ram.(none):/home/ram/work/mysql-4.0

sql/sql_yacc.yy:
  Auto merged

Fix for syntax error bug in SET TRANSACTION ISOLATION



BitKeeper/deleted/.del-sslopt-case.h~224c80e75dad4997:
  Delete: include/sslopt-case.h
client/mysql.cc:
  Fix for SSL and new my_getopt
client/mysqladmin.c:
  Fix for SSL and new my_getopt
client/mysqlcheck.c:
  Fix for SSL and new my_getopt
client/mysqldump.c:
  Fix for SSL and new my_getopt
client/mysqlimport.c:
  Fix for SSL and new my_getopt
client/mysqlshow.c:
  Fix for SSL and new my_getopt
include/Makefile.am:
  Fix for SSL and new my_getopt
include/sslopt-longopts.h:
  Fix for SSL and new my_getopt
libmysql/libmysql.c:
  Fix for SSL and new my_getopt
mysql-test/r/innodb.result:
  Simple test of transaction isolations
mysql-test/t/innodb.test:
  Simple test of transaction isolations
sql/mini_client.cc:
  Merge of mysql_real_connect() with libmysql.c
sql/mysqld.cc:
  Simple test of transaction isolations
  Remove use of current_thd in get_options()
sql/slave.cc:
  Indentation cleanup
sql/sql_yacc.yy:
  Fix for SET TRANSACTION ...

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

sql/sql_acl.cc:
  I revert my last change, as this requires further elaboration.
  For the moment we should document it in the manual.
  
  If MySQL 4.0.2 or higher is used with pre-4.0.2 user privilege table, 
  then user with no global privs at all will have privileges to:
  
  * LOCK TABLES
  * CREATE TEMPORARY TABLES
  * run commsnd SHOW DATABASES

into ram.(none):/home/ram/work/mysql-4.0

  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