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 mysql.com:/space/my/mysql-4.1

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

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

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

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


BitKeeper/deleted/.del-errmsg.txt~31abf77f9e7b9211:
  Auto merged

  Minor fix after character set conversion.


sql/share/japanese-sjis/errmsg.txt:
  Minor fix after character set conversion.

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

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

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

  Auto-merge fix:
  removing this file: error messages are done
  in a different way in 5.0.
.del-errmsg.txt~31abf77f9e7b9211:
  Delete: sql/share/japanese-sjis/errmsg.txt


BitKeeper/deleted/.del-errmsg.txt~31abf77f9e7b9211:
  Delete: sql/share/japanese-sjis/errmsg.txt
configure.in:
  Auto-merge fix:
  removing this file: error messages are done
  in a different way in 5.0.

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


configure.in:
  Auto merged

  Add SJIS version of Japanese error messages.
  Windows version should include this new file,
  instead of the EUC-JP version.


configure.in:
  Add SJIS version of Japanese error messages.
  Windows version should include this new file,
  instead of the EUC-JP version.

  new file

sql/opt_range.cc:
  SCCS merged
sql/records.cc:
  SCCS merged

into mysql.com:/dbdata/psergey/mysql-5.0-bug7885


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/item_subselect.cc:
  Auto merged

into mysql.com:/dbdata/psergey/mysql-4.1-bug7885

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