Needs additional manual merge.


mysys/mf_keycache.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_parse.cc:
  Properly resetting all key cache counters.
sql/sql_show.cc:
  Needs manual merge.

into mysql.com:/home/timka/mysql/src/4.1-dbg


sql/sql_show.cc:
  Auto merged

  #7943: Wrong prefix lengths reported on UTF-8 columns
  after merge fix.


sql/sql_show.cc:
  #7943: Wrong prefix lengths reported on UTF-8 columns
  after merge fix.

mysql-test/r/ctype_mb.result:
  Auto merged
sql/sql_show.cc:
  merge

SHOW KEYS FROM t1 now displays number of characters in Sub_part,
not number of bytes, to be compatible with SHOW CREATE TABLE.

- use incremental linker


configure.in:
  Fix weird link error on sol9x86

into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999


sql/share/errmsg.txt:
  Auto merged

into mysql.com:/home/jonas/src/mysql-5.0

fix as not to overwrite previoulsy set flags in configure


config/ac-macros/ha_ndbcluster.m4:
  fix as not to overwrite previoulsy set flags in configure
configure.in:
  fix as not to overwrite previoulsy set flags in configure
mysql-test/mysql-test-run.sh:
  movet START_AND_EXIT check so it can actually be used

into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged

ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  typo

  Make sure to ship error code in system error signal

No commit message

  read row size with wrong type


sql/ha_ndbcluster.cc:
  read row size with wrong type

  removed this since it easily gives errors if previous tests fail


mysql-test/t/ndb_autodiscover.test:
  removed this since it easily gives errors if previous tests fail
mysql-test/r/ndb_autodiscover.result:
  removed this since it easily gives errors if previous tests fail

into mysql.com:/home/jonas/src/mysql-5.0

  compile error


ndb/src/mgmapi/mgmapi.cpp:
  compile error

  skip ndbcluster start failure if --force given


mysql-test/mysql-test-run.sh:
  skip ndbcluster start failure if --force given

into mysql.com:/home/jonas/src/mysql-5.0

into mysql.com:/home/psergey/mysql-5.0-wl2126-fix

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged

  corrected bug when looking at dist keys in create table


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  corrected bug when looking at dist keys in create table

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


mysql-test/r/ndb_autodiscover.result:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

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


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

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl

    added testcase for Bug#8035
    added option to wait for not-started
    Bug#8035


mysql-test/mysql-test-run.sh:
  added variable NDB_MGM to be able to run the management client in tests
mysql-test/r/ndb_autodiscover.result:
  added testcase for Bug#8035
mysql-test/t/ndb_autodiscover.test:
  added testcase for Bug#8035
ndb/tools/waiter.cpp:
  added option to wait for not-started
sql/lock.cc:
  Bug#8035

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


mysql-test/r/func_in.result:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl

  Bug#7834 Illegal mix of collations in IN operator
  IN was the first function supporting 
  character set convertion.
  agg_arg_charsets() was written afterwards,
  which is more flexible.
  Now IN just reuses this function.


sql/item_cmpfunc.cc:
  Bug#7834 Illegal mix of collations in IN operator
  IN was the first function supporting 
  character set convertion.
  agg_arg_charsets() was written afterwards,
  which is more flexible.
  Now IN just reuses this function.

  Adding Shift-JIS error messages
  for Japanese Windows distributions.
  Thanks to Serg for help with a perl program 
  to merge 4.1 messages into 5.0 format :)


sql/share/errmsg.txt:
  Adding Shift-JIS error messages
  for Japanese Windows distributions.
  Thanks Serg for help :)

into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

into mysql.com:/home/jonas/src/mysql-4.1

  release connections when last op was simple read


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  bug#8010
    release connections when last op was simple read

  environment (using "build" on SUSE Linux)


Build-tools/Do-rpm:
  - added functionality to perform RPM builds inside of a chrooted build
    environment (using "build" on SUSE Linux) - see "--help" for more details

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

into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999

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