BitKeeper/etc/logging_ok:
  auto-union
include/mysql_com.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/ha_innodb.cc:
  Keep local copy

into narttu.mysql.fi:/my/mysql-3.23

into ua126d19.elisa.omakaista.fi:/home/my/bk/mysql-4.0


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

mysql-test/r/rpl_insert_id.result:
  Test logging of FOREIGN_KEY_CHECKS
mysql-test/t/rpl_insert_id.test:
  Test logging of FOREIGN_KEY_CHECKS
sql/log.cc:
  Code cleanup

into narttu.mysql.fi:/my/mysql-4.0


sql/log_event.cc:
  Auto merged

Added read_only variable


mysql-test/r/loaddata.result:
  Added testing of STARTING BY
mysql-test/t/loaddata.test:
  Added testing of STARTING BY
sql/log_event.cc:
  Code cleanup
sql/set_var.cc:
  Added read_only variable
sql/sql_update.cc:
  Remove not used variable

into mashka.mysql.fi:/home/my/mysql-3.23

  If FOREIGN_KEY_CHECKS=0, wrap in binlog SQL statements inside SET FOREIGN_...=0; ... ; SET FOREIGN_...=1


sql/log.cc:
  If FOREIGN_KEY_CHECKS=0, wrap in binlog SQL statements inside SET FOREIGN_...=0; ... ; SET FOREIGN_...=1

into mysql.com:/home/mysql_src/mysql-4.0


configure.in:
  Auto merged

BUILD/SETUP.sh:
  Quote $CXX to make a test work even if CXX had spaces in it.
  Automatically add ccache to CC and CXX if ccache is present.
configure.in:
  Accept "ccache gcc" in the test.

(this bug was already fixed in 4.0, I just copied and pasted two lines).

   now have a thread safe realpath(3) implementation - added check to only
   define -DHAVE_BROKEN_REALPATH where required
   (thanks to Martin Blapp from the FreeBSD team for the patch)


configure.in:
   - FreeBSD 4.8-STABLE (480101) and 5.0-CURRENT (500110) now have a thread
     safe realpath(3) implementation - added check to only define
     -DHAVE_BROKEN_REALPATH where required

  Disable UNIQU KEY error reporting in SHOW INNODB STATUS until we know if it slows down REPLACE significantly


innobase/row/row0ins.c:
  Disable UNIQU KEY error reporting in SHOW INNODB STATUS until we know if it slows down REPLACE significantly

into eagle.mysql.r18.ru:/home/vva/work/LOADDATA/mysql-3.23


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

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

into eagle.mysql.r18.ru:/home/vva/work/LOADDATA/mysql-4.0


sql/log_event.cc:
  Auto merged

mysql-test/r/rpl_loaddata.result:
  added test for 'STARTING BY'
mysql-test/std_data/rpl_loaddata2.dat:
  added test for 'STARTING BY'
mysql-test/t/rpl_loaddata.test:
  added test for 'STARTING BY'
sql/log_event.cc:
  fixed 'STARTING BY'

 - Updated version number in configure.in to 4.0.14 now that 4.0.13 has
   been tagged 


configure.in:
   - Updated version number to 4.0.14 now that 4.0.13 has been tagged

into narttu.mysql.fi:/my/mysql-4.0


sql/mysql_priv.h:
  Auto merged

myisam/myisamchk.c:
  Removed warning from fulltext when repairing many tables with fulltext index
sql/init.cc:
  Remove not used variables
sql/mysql_priv.h:
  Remove not used variables
sql/mysqld.cc:
  Removed not used variables
  Added option --read-only
  Change opt_do_pstack and master_ssl to get them to work with my_getopt
sql/set_var.cc:
  Option --read-only
sql/sql_parse.cc:
  Option --read-only

  Better instructions for the user if adding of new ibdata files fails


innobase/srv/srv0start.c:
  Better instructions for the user if adding of new ibdata files fails

  When calculating the buf pool dirty pages ratio, add also free pages to the LRU list length: no need to active flushing if there are lots of free pages in the buffer pool


innobase/buf/buf0buf.c:
  When calculating the buf pool dirty pages ratio, add also free pages to the LRU list length: no need to active flushing if there are lots of free pages in the buffer pool

  Search first only 10 % of the LRU list for a replaceable block before doing an LRU flush; enable again flushing of close pages also in a flush list (checkpointing) flush
trx0trx.c:
  Add forgotten return value (it was not used anywhere, fortunately)
ha_innodb.h, mysql_priv.h:
  Move declaration of srv_buf_pool_max_modified_pct to ha_innodb.h and enclose it to denote it is a C variable, not C++


sql/mysql_priv.h:
  Move declaration of srv_buf_pool_max_modified_pct to ha_innodb.h and enclose it to denote it is a C variable, not C++
sql/ha_innodb.h:
  Move declaration of srv_buf_pool_max_modified_pct to ha_innodb.h and enclose it to denote it is a C variable, not C++
innobase/trx/trx0trx.c:
  Add forgotten return value (it was not used anywhere, fortunately)
innobase/include/buf0lru.h:
  Search first only 10 % of the LRU list for a replaceable block before doing an LRU flush; enable again flushing of close pages also in a flush list (checkpointing) flush
innobase/buf/buf0buf.c:
  Search first only 10 % of the LRU list for a replaceable block before doing an LRU flush; enable again flushing of close pages also in a flush list (checkpointing) flush
innobase/buf/buf0flu.c:
  Search first only 10 % of the LRU list for a replaceable block before doing an LRU flush; enable again flushing of close pages also in a flush list (checkpointing) flush
innobase/buf/buf0lru.c:
  Search first only 10 % of the LRU list for a replaceable block before doing an LRU flush; enable again flushing of close pages also in a flush list (checkpointing) flush

  - QNX 6.2.1 actually defines HAVE_RINT
  - fixed rint(A) #define as it was causing compile errors on QNX


include/my_global.h:
  - QNX 6.2.1 actually defines HAVE_RINT
  - fixed rint(A) #define as it was causing compile errors on QNX
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

acinclude.m4:
  Auto merged
configure.in:
  Merge with 3.23
innobase/os/os0sync.c:
  No change
sql/sql_show.cc:
  No change

into narttu.mysql.fi:/my/mysql-4.0

mysql-test/mysql-test-run.sh:
  Ensure that tests are sorted
mysql-test/r/type_decimal.result:
  Test for bug with decimal()
mysql-test/t/type_decimal.test:
  Test for bug with decimal()
sql/sql_parse.cc:
  Fixed bug in CREATE ... DECIMAL(-1,1)

into narttu.mysql.fi:/my/mysql-3.23

  Check return value of pthread_cond_...


innobase/os/os0sync.c:
  Check return value of pthread_cond_...

  Check that pthread_mutex_init and pthread_mutex_destroy return 0


innobase/os/os0sync.c:
  Check that pthread_mutex_init and pthread_mutex_destroy return 0

  Backport from 4.0: We had forgotten to call pthread_mutex_destroy when we free an OS mutex in Unix


innobase/os/os0sync.c:
  Backport from 4.0: We had forgotten to call pthread_mutex_destroy when we free an OS mutex in Unix

  We had forgotten to call pthread_mutex_destroy when we free an OS mutex in Unix


innobase/os/os0sync.c:
  We had forgotten to call pthread_mutex_destroy when we free an OS mutex in Unix