mysql-test/r/innodb.result:
  A test case for non-functional rollback after inserting a row into
  MyISAM table with binary log enabled.
mysql-test/t/innodb.test:
  A test case for non-functional rollback after inserting a row into
  MyISAM table with binary log enabled.
sql/sql_show.cc:
  Displaying disabled keys in SHOW KEYS
sql/sql_table.cc:
  Fix for a serious bug with ALTER TABLE ENABLE / DISABLE KEYS

whenever a temporary MyISAM table had to be created from HEAP table.

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

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

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

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

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


sql/sql_show.cc:
  Auto merged

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

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

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.

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


sql/item.cc:
  Auto merged

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

code cleanup


mysql-test/r/having.result:
  A test for the bug fix for bug #176
mysql-test/t/having.test:
  A test for the bug fix for bug #176
sql/item.cc:
  A for the bug  #176
sql/item_func.cc:
  Code cleanup

   (Thanks to Marc Liyanage for spotting this)

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


sql/sql_show.cc:
  Auto merged

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

include/config-netware.h:
  Define USE_OLD_FUNCTIONS, remove NKS header includes
netware/BUILD/mwenv:
  Changes to compiler flags
netware/BUILD/nwbootstrap:
  bk changes syntax
netware/Makefile.am:
  Remove isamchk.def, mysqld.xdc, add comp_err.def to netware_build_files
netware/isamchk.def:
  Add XDCDATA
netware/isamlog.def:
  Add XDCDATA
netware/libmysql.def:
  Add XDCDATA
netware/my_manage.c:
  Changes in argument handling, use procve
netware/my_manage.h:
  Changes to argument handling, spawn
netware/my_print_defaults.def:
  Add XDCDATA
netware/myisamchk.def:
  Add XDCDATA
netware/myisamlog.def:
  Add XDCDATA
netware/myisampack.def:
  Add XDCDATA
netware/mysql.def:
  Add XDCDATA
netware/mysql_install.def:
  Add XDCDATA
netware/mysql_install_db.c:
  Argument handling changes, etc
netware/mysql_install_db.def:
  Add XDCDATA
netware/mysql_test_run.c:
  Argument handling, spawn changes, etc
netware/mysql_test_run.def:
  Add XDCDATA
netware/mysqladmin.def:
  Add XDCDATA
netware/mysqlbinlog.def:
  Add XDCDATA
netware/mysqlcheck.def:
  Add XDCDATA
netware/mysqld.def:
  Add XDCDATA
netware/mysqld_safe.def:
  Add XDCDATA
netware/mysqldump.def:
  Add XDCDATA
netware/mysqlimport.def:
  Add XDCDATA
netware/mysqlshow.def:
  Add XDCDATA
netware/mysqltest.def:
  Add XDCDATA
netware/pack_isam.def:
  Add XDCDATA
netware/perror.def:
  Add XDCDATA
netware/replace.def:
  Add XDCDATA
netware/resolveip.def:
  Add XDCDATA

  add foreign key value update test


sql-bench/crash-me.sh:
  add foreign key value update test