into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0

mysql-test/r/rpl000001.result:
  make the test "sasha-independent"
mysql-test/t/rpl000001.test:
  make the test "sasha-independent"

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0


sql/sql_yacc.yy:
  Auto merged

mysql-test/r/union.result:
  New results for optional UNION syntax
mysql-test/t/union.test:
  New  test for alternate syntax for UNION
sql/sql_delete.cc:
  Fixed bug in multi-table delete's with transactional tables
sql/sql_parse.cc:
  A small change to enable new UNION syntax
sql/sql_union.cc:
  New alternate UNION syntax
sql/sql_yacc.yy:
  New alternate UNION syntax

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


libmysql/libmysql.c:
  Auto merged

libmysql/libmysql.c:
  SCCS merged

  * Update WideXS mirror URLs


Docs/manual.texi:
  * Update WideXS mirror URLs

into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0

libmysql/libmysql.c:
  bug fixed (if mysql_real_connect() failed there were two pointers to malloc'ed strings, with memory corruption on free(), of course)

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0

mysql-test/r/keywords.result:
  merged lost change back

  * Change mirror URL


Docs/manual.texi:
  * Change mirror URL

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


sql/sql_table.cc:
  Auto merged

Updated "Contact Information".

into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0

removal of duplicate code in mf_iocache.cc 
work on failsafe replication
work on SEQ_READ_APPEND io cache


include/my_sys.h:
  updates for SEQ_READ_APPEND
libmysql/Makefile.am:
  fix for mysys/mf_iocache.c
libmysql/libmysql.c:
  updates for new format of SHOW SLAVE HOSTS
mysql-test/r/rpl000001.result:
  test replication of LOAD DATA LOCAL INFILE
mysql-test/r/rpl000002.result:
  updated test result
mysql-test/t/rpl000001.test:
  test LOAD DATA LOCAL INFILE
mysys/mf_iocache.c:
  cleanup to remove duplicate functionality
  some work on SEQ_READ_APPEND
sql/mf_iocache.cc:
  cleanup to remove duplicate functionality
sql/repl_failsafe.cc:
  more work on failsafe replication
sql/repl_failsafe.h:
  more work on failsafe replication
sql/slave.cc:
  cleanup
  more work on failsafe replication
sql/sql_load.cc:
  fixed bug on replicating empty file loads
  got LOAD DATA LOCAL INFILE to work again, and to be replicated
sql/sql_repl.cc:
  cleanup
  more work on failsafe replication
sql/sql_repl.h:
  more work on failsafe replication

  * Updated a lot


sql/share/estonian/errmsg.txt:
  * Updated a lot

BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
  Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/share/russian/errmsg.txt:
  merged (partially translated)

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

sql/ha_innobase.h:
  Auto merged
sql/sql_table.cc:
  Auto merged

include/mysqld_error.h:
  New error message added
libmysql/violite.c:
  FreeBSD fix
sql/ha_berkeley.h:
  HA_NO_FULLTEXT_KEY
sql/ha_heap.h:
  HA_NO_FULLTEXT_KEY
sql/ha_innobase.h:
  HA_NO_FULLTEXT_KEY
sql/ha_isam.h:
  HA_NO_FULLTEXT_KEY
sql/ha_isammrg.h:
  HA_NO_FULLTEXT_KEY
sql/ha_myisammrg.h:
  HA_NO_FULLTEXT_KEY
sql/share/czech/errmsg.txt:
  New error message added
sql/share/danish/errmsg.txt:
  New error message added
sql/share/dutch/errmsg.txt:
  New error message added
sql/share/english/errmsg.txt:
  New error message added
sql/share/estonian/errmsg.txt:
  New error message added
sql/share/french/errmsg.txt:
  New error message added
sql/share/german/errmsg.txt:
  New error message added
sql/share/greek/errmsg.txt:
  New error message added
sql/share/hungarian/errmsg.txt:
  New error message added
sql/share/italian/errmsg.txt:
  New error message added
sql/share/japanese/errmsg.txt:
  New error message added
sql/share/korean/errmsg.txt:
  New error message added
sql/share/norwegian-ny/errmsg.txt:
  New error message added
sql/share/norwegian/errmsg.txt:
  New error message added
sql/share/polish/errmsg.txt:
  New error message added
sql/share/portuguese/errmsg.txt:
  New error message added
sql/share/romanian/errmsg.txt:
  New error message added
sql/share/russian/errmsg.txt:
  New error message added
sql/share/slovak/errmsg.txt:
  New error message added
sql/share/spanish/errmsg.txt:
  New error message added
sql/share/swedish/errmsg.txt:
  New error message added
sql/share/ukrainian/errmsg.txt:
  New error message added
sql/sql_table.cc:
  FULLTEXT checks fixed
sql/violite.c:
  FreeBSD fix

myisam/Makefile.am:
  Comment out unused _DEPENDENCIES

scripts/mysqld_safe.sh:
  Fix the NOHUP_NICENESS test; previously it would break if the
  process already had a negative priority.

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


sql/item_func.h:
  Auto merged

include/ft_global.h:
  I have to checkin to be able to pull
myisam/ft_boolean_search.c:
  I have to checkin to be able to pull
myisam/ft_nlq_search.c:
  I have to checkin to be able to pull
myisam/ftdefs.h:
  I have to checkin to be able to pull
sql/item_func.cc:
  I have to checkin to be able to pull
sql/item_func.h:
  I have to checkin to be able to pull

Shuffling sections.

-WorkSpace and Project Files for VC++6.0
-InstallShield Files for setup program. 

myisam/ft_update.c:
  two bugfixes
mysql-test/r/fulltext.result:
  new tests
mysql-test/t/fulltext.test:
  new tests

mysql-test/r/join_outer.result:
  Update test results
mysql-test/r/null.result:
  Update test results