into  trift-lap.fambruehe:/MySQL/M51/push-5.1


configure.in:
  Auto merged
include/Makefile.am:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

mysql-test/t/partition.test:
  Disable warnings around CREATE TABLE ... ENGINE=BLACKHOLE to make this test case work without Blackhole compiled into the server.
mysql-test/t/partition_hash.test:
  Disable warnings around CREATE TABLE ... ENGINE=BLACKHOLE to make this test case work without Blackhole compiled into the server.

mysql-test/t/partition_not_windows-master.opt:
  BitKeeper file /benchmarks/ext3/TOSAVE/tsmith/bk/maint/51/mysql-test/t/partition_not_windows-master.opt
mysql-test/t/partition_not_windows.test:
  Tweak comments to be more meaningful

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


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

```yaml
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-vanilla-building
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-vanilla-building
```

Fix test cases to pass for a plain ./configure && make build. This includes disabling two test cases when certain features are not present in the server. We're not losing coverage from this because these features are usually present, and disabling them here only serves the purpose to make the test cases work in the unlikely case that they aren't.
---
fixes


mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test:
  Disable this test case if we don't have partitioning
mysql-test/t/rpl_row_basic_11bugs.test:
  Disable warnings in a number of places to make this test case work with servers that don't contain InnoDB
  ---
  make test case look better on request from reviewer
mysql-test/t/rpl_row_mysqlbinlog.test:
  Disable this test case if the server does not have cp932 compiled in
mysql-test/t/sp.test:
  Disable warnings during table creation in one place where engine=innodb is used, in order to make this test case work with a mysqld that was compiled without InnoDB.

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51

mysql-test/t/sp.test:
  Disable warnings during table creation in one place where engine=innodb is used, in order to make this test case work with a mysqld that was compiled without InnoDB.

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50

mysql-test/include/have_symlink.inc:
  BitKeeper file /benchmarks/ext3/TOSAVE/tsmith/bk/maint/51/mysql-test/include/have_symlink.inc

  Disable assert causing bug # 28030 temporarily, since it's non-critical, and the bug have been filed


server-tools/instance-manager/thread_registry.cc:
  Disable assert causing bug # 28030 temporarily, since it's non-critical, and the bug have been filed

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work


storage/ndb/test/ndbapi/testScanFilter.cpp:
  Auto merged

ndb/test/ndbapi/testScanFilter.cpp:
  restrict to GPLv2

- Use the 25141 fix.
- 26074 is duplicate, as 25141 has more comprehensive test


mysql-test/r/windows.result:
  - Removed duplicate results.
mysql-test/t/windows.test:
  - Removed InnoDB requirement. 
  - Removed duplicate test case.
sql/ha_partition.cc:
  - Reverted changes from bug 26074 because it conflicts with bug 25141.

BitKeeper/deleted/.del-partition.inc:
  Delete: mysql-test/include/partition.inc

BitKeeper/deleted/.del-partition_not_windows.test:
  Exclude
BitKeeper/deleted/.del-partition_windows.result:
  Exclude
BitKeeper/deleted/.del-partition_windows.test:
  Exclude
mysql-test/include/partition.inc:
  Exclude
sql/sql_table.cc:
  Exclude

into  alf.:D:/src/mysql-5.1-maint_pt

scripts/CMakeLists.txt:
  Fix broken bk native builds.
sql/log_event_old.cc:
  Fix for failing DBUG builds.

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


include/m_ctype.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/Makefile.am:
  Manual merge

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


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

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-27818

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

into  mysql.com:/home/ram/work/b27515/b27515.4.1

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/mysql.cc:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/mysql_upgrade.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
BitKeeper/deleted/.del-make_win_bin_dist:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

into  mysql.com:/home/ram/work/b27515/b27515.4.1

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


include/my_global.h:
  Auto merged

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


scripts/mysql_system_tables_fix.sql:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged

into  mysql.com:/home/ram/work/b27515/b27515.5.0


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

into  mysql.com:/home/ram/work/b27515/b27515.5.1


mysql-test/t/grant.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/r/grant.result:
  will be merged in a post-merge CS

into  mysql.com:/home/ram/work/b27515/b27515.5.0


mysql-test/r/grant.result:
  will be merged in a post-merge CS
mysql-test/t/grant.test:
  manual merge
sql/sql_parse.cc:
  manual merge