client/client_priv.h:
  Fix a compile failure.

mysql-test/r/view.result:
  Update results file

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

mysql-test/r/create.result:
  Update error message text
mysql-test/r/query_cache.result:
  Update warnings

sql/item_sum.cc:
  Auto merged
mysql-test/r/view.result:
  Manual merge
mysql-test/t/view.test:
  Manual megre
sql/sql_select.cc:
  Manual merge

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


BitKeeper/deleted/.del-not_windows.inc:
  Delete: mysql-test/include/not_windows.inc
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/rpl_flush_tables.test:
  Auto merged
sql-common/my_time.c:
  Auto merged
mysql-test/r/query_cache.result:
  Resolve conflict

mysql-test/r/query_cache.result:
  Updated results
mysql-test/t/query_cache.test:
  Change test to use a truly invalid date, now that dates like 
  '20050327 0:0:0' are handled as they are in 4.0.

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

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

into  fedora.(none):/home/reggie/bk/im_patch

into  fedora.(none):/home/reggie/bk/im_patch

into  fedora.(none):/home/reggie/bk/im_patch


server-tools/instance-manager/manager.cc:
  Auto merged
server-tools/instance-manager/mysqlmanager.cc:
  Auto merged
server-tools/instance-manager/options.h:
  Auto merged
server-tools/instance-manager/commands.cc:
  final merge of IM port code for Windows
server-tools/instance-manager/instance_map.cc:
  final merge of IM port code for Windows
server-tools/instance-manager/options.cc:
  final merge of IM port code for Windows

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

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

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

mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

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

  Back ported ndbcluster_support() from 5.0
  Corrected the server id handling


mysql-test/mysql-test-run.pl:
  Back ported ndbcluster_support() from 5.0
  Corrected the server id handling

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

  Added the blackhole storage engine to the Max builds


VC++Files/sql/mysqld.dsp:
  Added the blackhole storage engine to the Max builds

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


mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged

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

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


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

libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
sql/mysql_priv.h:
  merging
sql/mysqld.cc:
  merging

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


sql/ha_innodb.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

into mysql.com:/space/my/mysql-5.0-build


sql/ha_innodb.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

  the rpm spec file changelog


sql/ha_innodb.cc:
  - Merge: used local version (as the fix in 4.0 was a backport)
support-files/mysql.spec.sh:
  - manual merge from 4.0

4.1 version of the patch


libmysql/libmysql.c:
  here we close errorlog file
sql/mysql_priv.h:
  stderror_file declared
sql/mysqld.cc:
  stderror_file saved

  the MySQL-server RPM spec file (BUG#12348)


support-files/mysql.spec.sh:
  - Fixed the creation of the mysql user group account in the postinstall section
   (BUG#12348)

support-files/mysql.spec.sh:
  - fixed enabling the Archive storage engine for the mysqld-max binary

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


libmysqld/libmysqld.c:
  Auto merged

that platform, not real failures. (Bug #12328, Bug #11569)


mysql-test/t/packet.test:
  Skip this test on Windows
mysql-test/t/rpl_flush_tables.test:
  Skip this test on Windows
mysql-test/include/not_windows.inc:
  Add include for skipping tests on Windows

into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0

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

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