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

  Removed "examples/" from path to "ha_archive.cc"


VC++Files/sql/mysqld.vcproj:
  Removed "examples/" from path to "ha_archive.cc"

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


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

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

  mysql.user.password doesn't need utf8


mysql-test/lib/init_db.sql:
  mysql.user.password doesn't need utf8

Add Instance Manager tests.


mysql-test/include/im_check_os.inc:
  Currently Instance Manager tests are known to work only on UNIX platform.
  This header file is included in each IM-test in order to skip the test
  on Windows.
mysql-test/r/im_daemon_life_cycle.result:
  Results file for Instance Manager daemon test.
mysql-test/r/im_life_cycle.result:
  Results file for Instance Manager life cycle test.
mysql-test/r/im_options_set.result:
  Results file for Instance Manager SET statement test.
mysql-test/r/im_options_unset.result:
  Results file for Instance Manager UNSET statement test.
mysql-test/r/im_utils.result:
  Results file for Instance Manager utils test.
mysql-test/t/im_daemon_life_cycle-im.opt:
  Options file for Instance Manager daemon test.
mysql-test/t/im_daemon_life_cycle.imtest:
  Instance Manager daemon test (mysqltestrun-part).
mysql-test/t/im_life_cycle.imtest:
  Instance Manager life cycle test.
mysql-test/t/im_options_set.imtest:
  Instance Manager SET statement test.
mysql-test/t/im_options_unset.imtest:
  Instance Manager UNSET statement test.
mysql-test/t/im_utils.imtest:
  Instance Manager utils test.
mysql-test/t/kill_n_check.sh:
  The helper script. Its main idea is to kill some process and
  check that the process will (or will not) be restarted.

1) Add support to testing Instance Manager in daemon mode;
2) Don't run Instance Manager tests when running with --ps-protocol option;


mysql-test/lib/mtr_cases.pl:
  WL#2789 "Instance Manager: test using mysql-test-run testing framework"
  Skip/disable Instance Manager tests in the following cases:
    - we are testing embedded server;
    - we are running with --ps-protocol;
    - Instance Manager executable does not exist;
  Report about the reason in the standard way.
mysql-test/lib/mtr_process.pl:
  WL#2789 "Instance Manager: test using mysql-test-run testing framework"
  Make several attempts (i.e. send several signals to process) while trying to kill it.
mysql-test/mysql-test-run.pl:
  WL#2789 "Instance Manager: test using mysql-test-run testing framework"
  Add support for testing Instance Manager in daemon mode.

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


mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged

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

sql/ha_ndbcluster.cc:
  SCCS merged
sql/handler.h:
  SCCS merged

"SELECT ... FOR UPDATE executed as consistent read inside LOCK TABLES"
Do not discard lock_type information as handler::start_stmt() may require knowledge.
(fixed by Antony)

into  mysql.com:/home/dlenev/src/mysql-5.0-merges

into  mysql.com:/home/dlenev/src/mysql-5.0-bg13629

into  mysql.com:/home/hartmut/projects/mysql/dev/5.0


ndb/tools/ndb_config.cpp:
  Auto merged

  Revert back 5.0 changes to Visual Studio .Net project files


VC++Files/client/mysqlclient.vcproj:
  Revert back 5.0 changes to Visual Studio .Net project files
VC++Files/libmysql/libmysql.vcproj:
  Revert back 5.0 changes to Visual Studio .Net project files
VC++Files/libmysqld/libmysqld.vcproj:
  Revert back 5.0 changes to Visual Studio .Net project files
VC++Files/mysql.sln:
  Revert back 5.0 changes to Visual Studio .Net project files
VC++Files/mysys/mysys.vcproj:
  Revert back 5.0 changes to Visual Studio .Net project files
VC++Files/sql/mysqld.vcproj:
  Revert back 5.0 changes to Visual Studio .Net project files
VC++Files/strings/strings.vcproj:
  Revert back 5.0 changes to Visual Studio .Net project files

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


BUILD/SETUP.sh:
  Auto merged
client/mysql.cc:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/des_key_file.cc:
  Auto merged

back-port to 4.1 and merge forward to 5.x again properly.


BitKeeper/deleted/.del-bdb.vcproj~ed8534936e40cefb:
  Delete: VC++Files/bdb/bdb.vcproj
BitKeeper/deleted/.del-mysql.vcproj~f542eaa36b79459d:
  Delete: VC++Files/client/mysql.vcproj
BitKeeper/deleted/.del-mysqladmin.vcproj~4735738126ddd45f:
  Delete: VC++Files/client/mysqladmin.vcproj
BitKeeper/deleted/.del-mysqlclient.vcproj~4e8fd6c239c455e7:
  Delete: VC++Files/client/mysqlclient.vcproj
BitKeeper/deleted/.del-mysqldump.vcproj~72e1d52e8264ee24:
  Delete: VC++Files/client/mysqldump.vcproj
BitKeeper/deleted/.del-mysqlimport.vcproj~f3413e59c84590a6:
  Delete: VC++Files/client/mysqlimport.vcproj
BitKeeper/deleted/.del-mysqlshow.vcproj~89671830c737ad67:
  Delete: VC++Files/client/mysqlshow.vcproj
BitKeeper/deleted/.del-comp_err.vcproj~43c2674631ff6dcd:
  Delete: VC++Files/comp_err/comp_err.vcproj
BitKeeper/deleted/.del-dbug.vcproj~cec9ed672efe1999:
  Delete: VC++Files/dbug/dbug.vcproj
BitKeeper/deleted/.del-heap.vcproj~70c0cc1d680a51c1:
  Delete: VC++Files/heap/heap.vcproj
BitKeeper/deleted/.del-innobase.vcproj~71e1de81f11138bf:
  Delete: VC++Files/innobase/innobase.vcproj
BitKeeper/deleted/.del-mysqltest.vcproj~bba9139c2e68286a:
  Delete: VC++Files/client/mysqltest.vcproj
BitKeeper/deleted/.del-libmysql.vcproj~76b7601f350cd80c:
  Delete: VC++Files/libmysql/libmysql.vcproj
BitKeeper/deleted/.del-libmysqld.vcproj~a1d46f8635014df2:
  Delete: VC++Files/libmysqld/libmysqld.vcproj
BitKeeper/deleted/.del-myTest.vcproj~9dcbfc99784da76d:
  Delete: VC++Files/libmysqltest/myTest.vcproj
BitKeeper/deleted/.del-my_print_defaults.vcproj~805e02c029c13a3d:
  Delete: VC++Files/my_print_defaults/my_print_defaults.vcproj
BitKeeper/deleted/.del-test_libmysqld.vcproj~8ff2f936c65b4814:
  Delete: VC++Files/libmysqld/examples/test_libmysqld.vcproj
BitKeeper/deleted/.del-myisam.vcproj~32bb9e4a163fcb5a:
  Delete: VC++Files/myisam/myisam.vcproj
BitKeeper/deleted/.del-myisam_ftdump.vcproj~cf156af17f00e691:
  Delete: VC++Files/myisam_ftdump/myisam_ftdump.vcproj
BitKeeper/deleted/.del-myisamchk.vcproj~ca51391a749b5066:
  Delete: VC++Files/myisamchk/myisamchk.vcproj
BitKeeper/deleted/.del-myisamlog.vcproj~b642178bf2a443e:
  Delete: VC++Files/myisamlog/myisamlog.vcproj
BitKeeper/deleted/.del-myisammrg.vcproj~6534e59acbfbb63:
  Delete: VC++Files/myisammrg/myisammrg.vcproj
BitKeeper/deleted/.del-myisampack.vcproj~3df8a31f3b603a8:
  Delete: VC++Files/myisampack/myisampack.vcproj
BitKeeper/deleted/.del-mysql.sln~f2120278f8a437be:
  Delete: VC++Files/mysql.sln
BitKeeper/deleted/.del-mysql_test_run_new.vcproj~c953b417c83523a0:
  Delete: VC++Files/mysql-test/mysql_test_run_new.vcproj
BitKeeper/deleted/.del-mysqlbinlog.vcproj~d3fd2c6ed118cd99:
  Delete: VC++Files/mysqlbinlog/mysqlbinlog.vcproj
BitKeeper/deleted/.del-mysqlcheck.vcproj~562fe5a45c9337df:
  Delete: VC++Files/mysqlcheck/mysqlcheck.vcproj
BitKeeper/deleted/.del-mysqldemb.vcproj~a3e9e254c6b572ff:
  Delete: VC++Files/mysqldemb/mysqldemb.vcproj
BitKeeper/deleted/.del-mysqlserver.vcproj~31349c409587c097:
  Delete: VC++Files/mysqlserver/mysqlserver.vcproj
BitKeeper/deleted/.del-mysys.vcproj~6be390f26fc5539a:
  Delete: VC++Files/mysys/mysys.vcproj
BitKeeper/deleted/.del-perror.vcproj~622c06abaff48379:
  Delete: VC++Files/perror/perror.vcproj
BitKeeper/deleted/.del-regex.vcproj~9dfe1e8c7395a8e5:
  Delete: VC++Files/regex/regex.vcproj
BitKeeper/deleted/.del-replace.vcproj~921ddc8d8383ffc6:
  Delete: VC++Files/replace/replace.vcproj
BitKeeper/deleted/.del-mysql_client_test.vcproj~624117036ff1d17c:
  Delete: VC++Files/tests/mysql_client_test.vcproj
BitKeeper/deleted/.del-mysqld.vcproj~703886a28862bb2:
  Delete: VC++Files/sql/mysqld.vcproj
BitKeeper/deleted/.del-strings.vcproj~62578a38fd9e976:
  Delete: VC++Files/strings/strings.vcproj
BitKeeper/deleted/.del-test1.vcproj~f47ec733f5da69d5:
  Delete: VC++Files/test1/test1.vcproj
BitKeeper/deleted/.del-thr_test.vcproj~f5b31bfbc5366334:
  Delete: VC++Files/thr_test/thr_test.vcproj
BitKeeper/deleted/.del-dummy.cpp~d1d2a28e28f91f20:
  Delete: VC++Files/mysqlserver/dummy.cpp
BitKeeper/deleted/.del-vio.vcproj~f575b4666be84569:
  Delete: VC++Files/vio/vio.vcproj
BitKeeper/deleted/.del-zlib.vcproj~997ad815f1f4b73:
  Delete: VC++Files/zlib/zlib.vcproj

into  mysql.com:/home/timka/mysql/src/5.0-bug-13597

fix for bug #13451 "view test produces warning about unfreed memory").


sql/sql_view.cc:
  mysql_rename_view():
    Intead of doing full-blown opening of view and then doing extensive cleanup
    of its and main LEXes afterwards, let us just read and parse its .FRM file.

into  hundin.mysql.fi:/home/marko/mysql-5.0-bk


sql/ha_innodb.cc:
  Ignore 4.1 specific change.

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

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc


include/my_sys.h:
  Auto merged

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc

sql/ha_innodb.cc:
  Avoid bitwise arithmetics, as it might be difficult to read.  The
  added readability costs one register and two instructions on x86.

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


mysql-test/t/mysqldump.test:
  Auto merged

  New VC7 project files
des_key_file.cc:
  Visual C++ wants '"' for local include
mysql.cc:
  Cast my_cgets() argument for VC6 and VC7
dummy.cpp:
  Added to convince VS .Net generate a lib for mysqlserver


VC++Files/mysqlserver/dummy.cpp:
  Added to convince VS .Net generate a lib for mysqlserver
VC++Files/bdb/bdb.vcproj:
  New VC7 project files
VC++Files/client/mysql.vcproj:
  New VC7 project files
VC++Files/client/mysqladmin.vcproj:
  New VC7 project files
VC++Files/client/mysqlclient.vcproj:
  New VC7 project files
VC++Files/client/mysqldump.vcproj:
  New VC7 project files
VC++Files/client/mysqlimport.vcproj:
  New VC7 project files
VC++Files/client/mysqlshow.vcproj:
  New VC7 project files
VC++Files/client/mysqltest.vcproj:
  New VC7 project files
VC++Files/comp_err/comp_err.vcproj:
  New VC7 project files
VC++Files/dbug/dbug.vcproj:
  New VC7 project files
VC++Files/heap/heap.vcproj:
  New VC7 project files
VC++Files/innobase/innobase.vcproj:
  New VC7 project files
VC++Files/libmysql/libmysql.vcproj:
  New VC7 project files
VC++Files/libmysqld/examples/test_libmysqld.vcproj:
  New VC7 project files
VC++Files/libmysqld/libmysqld.vcproj:
  New VC7 project files
VC++Files/libmysqltest/myTest.vcproj:
  New VC7 project files
VC++Files/my_print_defaults/my_print_defaults.vcproj:
  New VC7 project files
VC++Files/myisam/myisam.vcproj:
  New VC7 project files
VC++Files/myisam_ftdump/myisam_ftdump.vcproj:
  New VC7 project files
VC++Files/myisamchk/myisamchk.vcproj:
  New VC7 project files
VC++Files/myisamlog/myisamlog.vcproj:
  New VC7 project files
VC++Files/myisammrg/myisammrg.vcproj:
  New VC7 project files
VC++Files/myisampack/myisampack.vcproj:
  New VC7 project files
VC++Files/mysql-test/mysql_test_run_new.vcproj:
  New VC7 project files
VC++Files/mysql.sln:
  New VC7 project files
VC++Files/mysqlbinlog/mysqlbinlog.vcproj:
  New VC7 project files
VC++Files/mysqlcheck/mysqlcheck.vcproj:
  New VC7 project files
VC++Files/mysqldemb/mysqldemb.vcproj:
  New VC7 project files
VC++Files/mysqlserver/mysqlserver.vcproj:
  New VC7 project files
VC++Files/mysys/mysys.vcproj:
  New VC7 project files
VC++Files/perror/perror.vcproj:
  New VC7 project files
VC++Files/regex/regex.vcproj:
  New VC7 project files
VC++Files/replace/replace.vcproj:
  New VC7 project files
VC++Files/sql/mysqld.vcproj:
  New VC7 project files
VC++Files/strings/strings.vcproj:
  New VC7 project files
VC++Files/test1/test1.vcproj:
  New VC7 project files
VC++Files/tests/mysql_client_test.vcproj:
  New VC7 project files
VC++Files/thr_test/thr_test.vcproj:
  New VC7 project files
VC++Files/vio/vio.vcproj:
  New VC7 project files
VC++Files/zlib/zlib.vcproj:
  New VC7 project files
client/mysql.cc:
  Cast my_cgets() argument for VC6 and VC7
sql/des_key_file.cc:
  Visual C++ wants '"' for local include
scripts/make_win_src_distribution.sh:
  New VC7 project files

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

  Fix compile error with gcc296


ndb/src/common/util/SimpleProperties.cpp:
  Fix compile error with gcc296

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

Quote here is unneccessary as it should all be handled in
quote_opt_arg().

sql/ha_innodb.cc:
  innobase_convert_and_store_changed_col(), calc_row_difference():
   Replace parameter "is_unsigned" with "prtype".
  innobase_convert_and_store_changed_col():
   When trimming spaces, note that UCS2 spaces are 0x0020, not 0x20.

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc


myisam/mi_open.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
myisam/myisampack.c:
  Auto merged
sql/sql_parse.cc:
  Auto merged

mysys/mf_keycache.c:
  Auto merged

"configure --without-server"   (without giving "--enable-thread-safe-client").


mysys/mf_keycache.c:
  This module is needed both in the server (multi-threaded) and in some myisam tools (single-threaded).
  For the latter use, compilation failed in a "configure --without-server" as thread support was not
  defined then (unless "--enable-thread-safe-client" was also given, but this should not be required).
  The solution is to guard all threading operations in "#ifdef THREAD", and in the "#else" case adding
  assertions where appropriate. This fixes bug#11680.
  Also minor cleanup: Delete an unused variable, change "return" -> "DBUG_RETURN" in one place.

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


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvrConfig.cpp:
  Auto merged

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


include/my_sys.h:
  Auto merged
mysys/default.c:
  Auto merged

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


ndb/tools/ndb_config.cpp:
  merge

  Check returnvalue on load/fetch configuration


ndb/tools/ndb_config.cpp:
  Check returnvalue on load/fetch configuration