into mysql.com:/home/my/mysql-4.1

into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1


tests/client_test.c:
  Auto merged

as argument(s) after options.

Added option -T to display all current test names.

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

sql/mysqld.cc:
  Auto merged

client/mysqldump.c:
  Merge with 4.0 (and reordering of options)
client/mysqltest.c:
  Added DB as a user variable
myisam/mi_check.c:
  Trivial cleanup
mysql-test/r/grant.result:
  Move test to be in same order as in 4.0
mysql-test/r/mix_innodb_myisam_binlog.result:
  Updated results
mysql-test/r/ps_1general.result:
  Updated tests to work after privilege fixes
mysql-test/r/timezone3.result:
  Updated results to 4.1
mysql-test/t/ps_1general.test:
  Updated tests to work after privilege fixes
sql-common/my_time.c:
  Applied sub-second patch from 4.0
sql/sql_acl.cc:
  More debugging

sql/share/french/errmsg.txt:
  typos fixed
sql/share/greek/errmsg.txt:
  typos fixed
sql/share/portuguese/errmsg.txt:
  typos fixed
sql/share/romanian/errmsg.txt:
  typos fixed
sql/share/serbian/errmsg.txt:
  typos fixed
sql/share/spanish/errmsg.txt:
  typos fixed
sql/share/swedish/errmsg.txt:
  typos fixed

  Recognize another Texinfo tag.


scripts/fill_help_tables.sh:
  Recognize another Texinfo tag.

  Add missing sentinel.


client/mysqldump.c:
  Add missing sentinel.

BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-Makefile.am:
  Delete: Docs/Images/Makefile.am
Build-tools/Bootstrap:
  Auto merged
Docs/Makefile.am:
  Auto merged
configure.in:
  Auto merged
include/mysql.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysys/default.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/log.cc:
  Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
client/mysqldump.c:
  merge with 4.0
  (This only reorders options)
sql/ha_innodb.cc:
  merge with 4.0 (Keep original code)
sql/time.cc:
  Note that part of this patch is done in my_time.c

into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6551

into mysql.com:/home/my/mysql-4.1

  Prevent creation of a row which grants no rights
  Test included


mysql-test/r/grant.result:
  Test for Bug#6123
mysql-test/t/grant.test:
  Test for Bug#6123
sql/sql_acl.cc:
  Bug#6123
    Prevent creation of useless row

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1

  Reorder options, revise --hex-blob help string.


client/mysqldump.c:
  Reorder options, revise --hex-blob help string.

myisam/mi_check.c:
  one more correctness check for CHECK of fulltext indexes

  Remove duplicated innodb max purge lag code


innobase/trx/trx0purge.c:
  Remove duplicated innodb max purge lag code

into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug6469


sql/sql_yacc.yy:
  Auto merged

into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug6469


sql/sql_yacc.yy:
  Auto merged

  better printouts in ndb_test_platform


ndb/tools/ndb_test_platform.cpp:
  better printouts in ndb_test_platform

  fixed so that connectring option works


ndb/tools/waiter.cpp:
  fixed so that connectring option works

  made sleep time for second master larger so that it has time to start


mysql-test/mysql-test-run.sh:
  made sleep time for second master larger so that it has time to start

into mysql.com:/home/my/mysql-4.1

    removed some errorcodes not used


ndb/src/mgmclient/CommandInterpreter.cpp:
  forgot a return 0
ndb/src/ndbapi/ndberror.c:
  removed some errorcodes not used

mysql-test/t/client_test.test:
  Fix crash when user has a conflicting defaults file
tests/client_test.c:
  Write fatal errors even if silent is used

  fixed typo


mysql-test/ndb/ndbcluster.sh:
  fixed typo

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

into mysql.com:/home/mysql_src/mysql-4.1-clean


sql/sql_yacc.yy:
  Auto merged

sql/sql_yacc.yy:
  forgotten ';' (bison 1.875 accepts if it's not there, but 1.75 does not)

my_umask and my_umask_dir initialization has been moved to the my_init() func.


mysys/my_init.c:
  A fix (bug #6551: UMASK_DIR & UMASK not taken into account (mysqld.cc my_init.c inconsistency))
sql/mysqld.cc:
  A fix (bug #6551: UMASK_DIR & UMASK not taken into account (mysqld.cc my_init.c inconsistency))

  Handle some additional Texinfo tags that were being missed.


scripts/fill_help_tables.sh:
  Handle some additional Texinfo tags that were being missed.

into mysql.com:/home/mysql_src/mysql-4.1-clean


sql/handler.cc:
  Auto merged

no new message in 4.1 (causes merge issues with 5.0). Using ER_UNKNOW_ERROR and hardcoded message string instead.


include/mysqld_error.h:
  no new message in 4.1 (causes merge issues with 5.0)
sql/handler.cc:
  no new message in 4.1 (causes merge issues with 5.0)
sql/share/czech/errmsg.txt:
  no new message in 4.1 (causes merge issues with 5.0)
sql/share/danish/errmsg.txt:
  no new message in 4.1 (causes merge issues with 5.0)
sql/share/dutch/errmsg.txt:
  no new message in 4.1 (causes merge issues with 5.0)
sql/share/english/errmsg.txt:
  no new message in 4.1 (causes merge issues with 5.0)
sql/share/estonian/errmsg.txt:
  no new message in 4.1 (causes merge issues with 5.0)
sql/share/french/errmsg.txt:
  no new message in 4.1 (causes merge issues with 5.0)
sql/share/german/errmsg.txt:
  no new message in 4.1 (causes merge issues with 5.0)
sql/share/greek/errmsg.txt:
  no new message in 4.1 (causes merge issues with 5.0)
sql/share/hungarian/errmsg.txt:
  no new message in 4.1 (causes merge issues with 5.0)
sql/share/italian/errmsg.txt:
  no new message in 4.1 (causes merge issues with 5.0)
sql/share/japanese/errmsg.txt:
  no new message in 4.1 (causes merge issues with 5.0)
sql/share/korean/errmsg.txt:
  no new message in 4.1 (causes merge issues with 5.0)
sql/share/norwegian-ny/errmsg.txt:
  no new message in 4.1 (causes merge issues with 5.0)
sql/share/norwegian/errmsg.txt:
  no new message in 4.1 (causes merge issues with 5.0)
sql/share/polish/errmsg.txt:
  no new message in 4.1 (causes merge issues with 5.0)
sql/share/portuguese/errmsg.txt:
  no new message in 4.1 (causes merge issues with 5.0)
sql/share/romanian/errmsg.txt:
  no new message in 4.1 (causes merge issues with 5.0)
sql/share/russian/errmsg.txt:
  no new message in 4.1 (causes merge issues with 5.0)
sql/share/serbian/errmsg.txt:
  no new message in 4.1 (causes merge issues with 5.0)
sql/share/slovak/errmsg.txt:
  no new message in 4.1 (causes merge issues with 5.0)
sql/share/spanish/errmsg.txt:
  no new message in 4.1 (causes merge issues with 5.0)
sql/share/swedish/errmsg.txt:
  no new message in 4.1 (causes merge issues with 5.0)
sql/share/ukrainian/errmsg.txt:
  no new message in 4.1 (causes merge issues with 5.0)