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)

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

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

myisam/mi_test3.c:
  Fixed compiler warning
myisam/rt_test.c:
  Fixed compiler warning

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

  cp1257 is Lithuanian sorting


sql/share/charsets/Index.xml:
  cp1257 is Lithuanian sorting
sql/share/charsets/cp1257.xml:
  cp1257 is Lithuanian sorting

pclatin1 -> cp850
pclatin2 -> cp852


BitKeeper/deleted/.del-pclatin1.xml~d42c4a35e61526fa:
  Delete: sql/share/charsets/pclatin1.xml
BitKeeper/deleted/.del-pclatin2.xml~419e68f6672a99a:
  Delete: sql/share/charsets/pclatin2.xml

  It's now working under HTTPD as a CGI. Very convenient!


mysys/charset2html.c:
  It's now working under HTTPD as a CGI. Very convenient!

  We don't need separate hash_sort() and hash_caseup()
  We don't need tosort(). strnxfrm will do the same.

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

  We finally decided that national character set is utf8 :)


sql/sql_string.cc:
  We finally decided that national character set is utf8 :)

BitKeeper/deleted/.del-mysqld.xdc~1befdfee55e31716:
  Delete: netware/mysqld.xdc

into eagle.mysql.r18.ru:/home/vva/work/RUS_READLINE/mysql-4.1

into eagle.mysql.r18.ru:/home/vva/work/RUS_READLINE/mysql-4.1

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

  Use MBRContains() style for what we have implemented. Contains() will be used for real "contains" relation in the future.


sql/lex.h:
  Use MBRContains() style for what we have implemented. Contains() will be used for real "contains" relation in the future.

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


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

geometry type (POINT, LINESTRING, etc)
and changed all into "GEOMETRY".