into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1

  Type


sql/share/charsets/Index.xml:
  Type

mysql-test/r/subselect.result:
  Updating results after SUBSELECT was changed into SUBQUERY.

into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.sp


sql/item_strfunc.cc:
  Auto merged

BitKeeper/deleted/.del-gis.txt~2dde6d55b3075921:
  Delete: Docs/gis.txt

into mysql.com:/home/pem/work/mysql-4.1

into mysql.com:/home/walrus/bk/41

  Geometry is now large blob


sql/field.cc:
  Geometry is now large blob

sql/item_sum.cc:
  Fixed bug in warning handling.
sql/item_sum.h:
  Fixed bug in warning handling.
sql/sql_class.h:
  Fixed bug in warning handling.
sql/sql_error.cc:
  Fixed bug in warning handling.
strings/my_vsnprintf.c:
  After merge fix

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


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

BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-libmysqld.def~6ca0fa0537a3431c:
  Auto merged
BitKeeper/deleted/.del-mysql.xdc:
  Delete: netware/mysql.xdc
BitKeeper/deleted/.del-mysqld.xdc~1befdfee55e31716:
  Auto merged
BitKeeper/deleted/.del-nwbootstrap~f3bc723dad4ed7e:
  Auto merged
BitKeeper/deleted/.del-nwconfigure~86da352b5e031ed9:
  Auto merged
client/mysql.cc:
  Auto merged
include/my_pthread.h:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/backup.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_init.c:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/thr_mutex.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql-bench/crash-me.sh:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
strings/my_vsnprintf.c:
  Auto merged
sql/sql_parse.cc:
  Merge with 4.0 (Ignore not existing tables with DROP TEMPOARAY TABLE on slave)
mysql-test/r/rpl_loaddata.result:
  Auto merged

sql/log_event.cc:
  Fixed a wrong && test -> &

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

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


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

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

sql/log_event.cc:
  fix bug #183 (Replication of temporary tables not working)

  correct misprint in the sub test_update


sql-bench/test-transactions.sh:
  correct misprint in the sub test_update

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

into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.sp

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

  Windows compilation fix


sql/sql_cache.cc:
  Windows compilation 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

  missing comma


sql/mysqld.cc:
  missing comma

into kishkin.ru:/home/wax/mysql-4n

include/mysqld_error.h:
  resolve error message
sql/mysqld.cc:
  resolve option
sql/set_var.cc:
  resolve variable
sql/share/english/errmsg.txt:
  resolve error message
sql/sql_class.h:
  resolve

into mysql.com:/space/my/mysql-4.1-build

 - re-enabled OpenSSL for the Max RPM package


Build-tools/Do-compile:
   - increased bdb_max_lock value from 60000 -> 240000
     (got many errors "Lock table is out of available locks" when running
     sql-bench with InnoDB)
support-files/mysql.spec.sh:
   - re-enabled OpenSSL for the 4.1 Max RPM

BitKeeper/etc/logging_ok:
  auto-union