into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile

sql/ha_federated.h:
  copy-paste fix
sql/sql_parse.cc:
  after-merge fix

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile

into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa

into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa


sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

into neptunus.(none):/home/msvensson/mysql/mysql-5.0

mysql-test/r/ndb_cache2.result:
  Decreased ndb_cache_check_time to avoid timing related problem on aix52-64bit and octane2
mysql-test/t/ndb_cache2.test:
  Decreased ndb_cache_check_time to avoid timing related problem on aix52-64bit and octane2

into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa

into mysql.com:/usr/home/bar/mysql-5.0.fresh


include/my_base.h:
  Auto merged
myisam/mi_rnext_same.c:
  Auto merged
mysql-test/r/ctype_latin1_de.result:
  Auto merged

Backporting Monty's fix for 5.0 into 4.1.

into deer.(none):/home/hf/work/mysql-5.0.clean


sql/mysqld.cc:
  Auto merged

Added NULL initilizers for commit_by_xid and rollback_by_xid in hton struct. Changed back table->in_use to current_thd.

into deer.(none):/home/hf/work/mysql-4.1.clean

Some variable wasn't moved to the initial state during mysql_server_end


myisam/ft_stopwords.c:
  resetting ft_stopword_file
sql/mysqld.cc:
  free_charsets() call added

into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa


configure.in:
  Auto merged
mysql-test/r/drop_temp_table.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into neptunus.(none):/home/msvensson/mysql/mysql-5.0-8583


BitKeeper/etc/logging_ok:
  auto-union

 - the variable MASTER_MY_PORT1 was used from the script, but it was not set to the port where the second server was started


mysql-test/mysql-test-run.sh:
  Export the variable MASTER_MY_PORT1 from the place where the second master is started

config/ac-macros/character_sets.m4


mysys/charset-def.c:
  Auto merged
strings/ctype-uca.c:
  Auto merged

into mysql.com:/usr/home/bar/mysql-5.0.fresh


mysql-test/mysql-test-run.pl:
  Auto merged

in the grant tables case-insensitive and updating test results.


scripts/mysql_create_system_tables.sh:
  Fix collation of procs_priv.proc_priv
scripts/mysql_fix_privilege_tables.sql:
  Fix enum fields to have case-insensitive collation
mysql-test/r/information_schema.result:
  Update results
mysql-test/r/system_mysql_db.result:
  Update results
mysql-test/r/lowercase_table_grant.result:
  Update results

BitKeeper/triggers/post-commit:
  Auto merged
mysql-test/r/lowercase_table2.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/system_mysql_db.result:
  Update results
scripts/mysql_create_system_tables.sh:
  Merge fix for Bug #7617, making enum fields in grant tables
  case-insensitive.
scripts/mysql_fix_privilege_tables.sql:
  Merge fix for Bug #7617, and fix additional enum/set columns.
sql/sql_acl.cc:
  Hand-merge due to whitespace change
sql/sql_lex.cc:
  Hand-merge bug fix.

into mysql.com:/home/jimw/my/mysql-5.0-clean

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

into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8147.3

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

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


scripts/mysql_create_system_tables.sh:
  Auto merged

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


sql/sql_acl.cc:
  Auto merged

into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8147.3

sql/ha_ndbcluster.cc:
  incorporating changes from Martin
sql/ha_ndbcluster.h:
  incorporating changes from Martin
sql/item_func.h:
  remove a warning
sql/sql_yacc.yy:
  remove a warning

tests/mysql_client_test.c:
  SCCS merged

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


sql/sql_base.cc:
  Auto merged

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

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

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


BitKeeper/triggers/post-commit:
  Auto merged

into mysql.com:/home/jimw/my/mysql-4.0-clean

into mysql.com:/home/jimw/my/mysql-5.0-clean


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged

sql/item_func.h:
  Fix a compoile error (missing return value) as proposed by Tomas Ulin.