mysys/my_vsnprintf.c:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/log.cc:
  Auto merged

mysys/my_vsnprintf.c:
  safety fix
sql/log.cc:
  safety fix

mysqldump --delete-master-logs
Portability fix for hammer
Memory overrun for MyISAM
LOAD DATA LOCAL replication bug fix.


BitKeeper/etc/logging_ok:
  auto-union
sql/log.cc:
  Auto merged
client/client_priv.h:
  Merge with 3.23
client/mysqldump.c:
  Merge with 3.23
myisam/mi_dynrec.c:
  Merge with 3.23
mysql-test/t/myisam.test:
  Merge with 3.23
sql/log_event.cc:
  Merge with 3.23
sql/slave.cc:
  Merge with 3.23
sql/sql_delete.cc:
  Merge with 3.23

sql/log.cc:
  Portability fix (for hammer)

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

apply to GRANT and REVOKE too. For example if replicate-wild-ignore-table=mysql.%,
GRANT and REVOKE will not be replicated on the slave.

logged, but read as LOAD DATA INFILE REPLACE"
This was just bad && instead of &, but nasty consequences.
This should be merged to 4.0 BUT it will not be automatic (some code
has moved from log_event.h to log_event.cc, and log_event.cc has changed);
please Merging Man, do 'bk grep REPLACE_FLAG' in 4.0/sql
to find all the new places.


sql/log_event.cc:
  & instead of && when testing flags
sql/slave.cc:
  & instead of && when testing flags

into mysql.com:/home/greg/bk/mysql-4.0

BitKeeper/deleted/.del-mysqld.xdc~1befdfee55e31716:
  Delete: netware/mysqld.xdc
BitKeeper/deleted/.del-nwbootstrap~f3bc723dad4ed7e:
  Delete: netware/nwbootstrap
BitKeeper/deleted/.del-nwconfigure~86da352b5e031ed9:
  Delete: netware/nwconfigure
BitKeeper/deleted/.del-libmysqld.def~6ca0fa0537a3431c:
  Delete: netware/libmysqld.def

   libmysqld/examples/Makefile.am (thanks to Christian Hammers from Debian
   for pointing this out)


libmysqld/examples/Makefile.am:
   - added missing @WRAPLIBS@ to LIBS

mysql-test/r/func_str.result:
  test result for truncating REPLACE result
mysql-test/t/func_str.test:
  test with long arguments for REPLACE
sql/item_strfunc.cc:
  fix for counting REPLACE result length

netware/BUILD/create-patch:
  Change mode to -rwxrwxr-x
scripts/make_binary_distribution.sh:
  Split BIN_FILES into more generic parts, with no repetition

into mysql.com:/home/greg/bk/mysql-4.0

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


sql/mysqld.cc:
  Auto merged

  Make the default value of innodb_flush_log_at_trx_commit 1, not 0 which compromises the Durability of a transaction


sql/mysqld.cc:
  Make the default value of innodb_flush_log_at_trx_commit 1, not 0 which compromises the Durability of a transaction

into mysql.com:/home/greg/bk/mysql-4.0

sql/sql_show.cc:
  fixed problem of port without host in SHOW PROCESSLIST

sql-bench/limits/mysql.cfg:
  Update to new crash me

   commands for building the sources
 - removed duplicate option "--revision"
 - added help for new option and reformatted help text a bit

  add new parameter  checks length_of_varchar_field,
  add new auxilary functions:
  get_recordset
  compare_recordset
  print_recordset


sql-bench/crash-me.sh:
  add new parameter  checks length_of_varchar_field,
  add new auxilary functions:
  get_recordset
  compare_recordset
  print_recordset

RESET MASTER, this breaks replication).
In the slave SQL thread, any DROP TEMPORARY TABLE is silently
converted to DROP TEMPORARY TABLE IF EXISTS, not to have irrelevant
"table does not exist". See comments in code or bug #186 for an example
of how irrelevant errors like this can arise.

least one BLOB column.

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


mysql-test/r/group_by.result:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged

mysql-test/r/group_by.result:
  Test for group by + alias bug
mysql-test/t/group_by.test:
  Test for group by + alias bug

into mysql.com:/home/greg/bk/mysql-4.0

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

   (Thanks to Marc Liyanage for spotting this)

into mysql.com:/suse80/my/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union

cause compatibility problems. Fix will be enabled in 4.1.

e.g. default value is not accepted with auto_increment anymore.

at the same time.

    Now it does not SEGV, but USER() is still badly replicated
    (it is replicated to ""), which is a lower priority bug.


sql/item_strfunc.cc:
  Fix for #178  Replicating INSERT VALUES(USER()) crashes (SEGV) the slave
  Now it does not SEGV, but USER() is still badly replicated
  (it is replicated to ""), which is a lower priority bug.

client/mysql.cc:
  Remove unnecessary pthread_yield calls for NetWare
client/mysqldump.c:
  Remove unnecessary pthread_yield calls for NetWare
include/my_pthread.h:
  Special extern my_pthread_cond_timedwait no longer required for NetWare
mysql-test/t/backup.test:
  replace_result added so test passes correctly on NetWare
mysys/default.c:
  Add conditional to avoid non-applicable file checking on NetWare
mysys/my_init.c:
  Remove working directory change from netware_init()
mysys/my_pthread.c:
  Remove unnecessary NetWare version of my_pthread_cond_timedwait
mysys/thr_mutex.c:
  Remove unnecessary NetWare block
scripts/make_binary_distribution.sh:
  Changes to clear up extraneous EXTRA_BIN_FILES, NetWare sections

netware/mysqld_safe.c:
  Changes to argument handling, spawn, etc