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

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

mysql-test/r/union.result:
  Fix order of test results

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


VC++Files/sql/mysqld.dsp:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/alter_table.result:
  Resolve conflict
mysql-test/t/alter_table.test:
  Resolve conflict

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


vio/viosslfactories.c:
  Auto merged

into  mysql.com:/home/timka/mysql/src/5.0-virgin

into mysql.com:/home/gluh/MySQL/Merge/5.0


vio/viosslfactories.c:
  Auto merged

Commented out one failing query in the regression test (reported as a bug).


mysql-test/r/join.result:
  Commented out failing query.
mysql-test/t/join.test:
  Commented out failing query.

Implemented specialized regression test for the WL.


mysql-test/r/join.result:
  Test results for natural join tests.
mysql-test/t/join.test:
  Specialized test for natural join, and join ... on.

  Add XEON detection (fix)


BUILD/check-cpu:
  Add XEON detection (fix)

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


mysql-test/r/union.result:
  Auto merged
sql/item.cc:
  Auto merged
vio/viosslfactories.c:
  Auto merged
mysql-test/t/union.test:
  Resolve conflict

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


sql/item.cc:
  Auto merged

mysql-test/t/disabled.def:
  Disable failing NDB tests

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

into  mysql.com:/home/alexi/dev/mysql-5.0-build

into  mysql.com:/usr/local/mysql/mysql-5.0

into  mysql.com:/usr/local/mysql/mysql-5.1-new


BitKeeper/deleted/.del-type_newdecimal-big.result:
  Delete: mysql-test/r/type_newdecimal-big.result
BitKeeper/deleted/.del-type_newdecimal-big.test:
  Delete: mysql-test/t/type_newdecimal-big.test
mysql-test/r/type_newdecimal.result:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged

mysql-test/r/type_ranges.result:
  result fixed

Removed warnings that depends on floating point comparisions in type_newdecimal.test which caused failures in some setups
[Backported from mysql-5.1-new @1.1961.1.1]


mysql-test/r/type_newdecimal.result:
  Moved long running query to type_newdecimal-big.test
  Removed warnings that depends on floating point comparisions
  [Backported from mysql-5.1-new]
mysql-test/t/type_newdecimal.test:
  Moved long running query to type_newdecimal-big.test
  Removed warnings that depends on floating point comparisions
  [Backported from mysql-5.1-new]

into mysql.com:/home/hf/work/mysql-5.0.14693


sql/sql_table.cc:
  Auto merged

into mysql.com:/home/gluh/MySQL/Merge/4.1

  added SSL_library_init()

into  mysql.com:/usr/home/bar/mysql-5.1-new


client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/table.cc:
  Auto merged

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


mysql-test/r/ctype_recoding.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged

into  mysql.com:/usr/home/bar/mysql-4.1.b10446


sql/item.cc:
  Auto merged

Thanks Paul for pointing it out :)


client/mysqldump.c:
  Oops, obvious typo aye? Should hae had --replace not --replace-names

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

mysql-test/r/show_check.result:
  Updated result.

into  mysql.com:/usr/local/mysql/mysql-5.0

VC++Files/sql/mysqld.dsp:
  Corrected wrong path to ha_archive.cpp (causes compilation
   error in VC++)

into  mysql.com:/usr/home/pem/mysql-5.1-new


include/my_base.h:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/examples/ha_example.cc:
  Auto merged
storage/myisam/ft_parser.c:
  Auto merged
storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
libmysqld/Makefile.am:
  Manual merge.
sql/ha_ndbcluster.cc:
  Manual merge.
sql/mysqld.cc:
  Manual merge.

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


client/mysql.cc:
  Auto merged
client/mysqladmin.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqlshow.c:
  Auto merged
client/mysqltest.c:
  Auto merged

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


mysql-test/t/ps.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/r/ps.result:
  SCCS merged

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


mysql-test/t/create.test:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/create.result:
  Resolve conflict

into mysql.com:/M50/mysql-5.0

    Care for case-insignificant platforms (Mac OS X, Windows).


mysql-test/t/alter_table.test:
  Care for case-insignificant platforms (Mac OS X, Windows).

into  devsrv-b.mysql.com:/space/magnus/mysql-5.0

into  mysql.com:/usr/local/mysql/mysql-4.1