into serg.mylan:/usr/home/serg/Abk/m51

into mysql.com:/M51/bug18810-5.1

support-files/mysql.server.sh:
  Auto merged

support-files/mysql.server.sh:
  Auto merged

support-files/mysql.server.sh:
  Ensure that some necessary / useful system services have been started already,
  when the MySQL server is started. 
  This fixes bug#18810 and bug#20118

into serg.mylan:/usr/home/serg/Abk/m51

into  mysql.com:/home/marty/MySQL/mysql-5.1


sql/sql_table.cc:
  Auto merged

into  may.pils.ru:/home/svoj/devel/mysql/merge/mysql-5.1


sql/sql_table.cc:
  Manual merge - use local.

into  mysql.com:/home/marty/MySQL/mysql-5.1


sql/mysqld.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  manual merge

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


sql/ha_ndbcluster.cc:
  manual merge

corrupt
  - add infinite retry on drop table temporary error

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

- add infinite retry on drop table temporary error


mysql-test/r/ndb_restore_partition.result:
  New BitKeeper file ``mysql-test/r/ndb_restore_partition.result''
mysql-test/t/ndb_restore_partition-master.opt:
  New BitKeeper file ``mysql-test/t/ndb_restore_partition-master.opt''
mysql-test/t/ndb_restore_partition.test:
  New BitKeeper file ``mysql-test/t/ndb_restore_partition.test''

Added flag to detect renaming of fields (not supported as fast alter table for ndbcluster): psot review comment: cleared flag before checking

Added flag to detect renaming of fields (not supported as fast alter table for ndbcluster): added test case

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

mysql-test/r/create_not_windows.result:
  Update test result to use uppercase for keywords

Don't rely on table->null_row when no index is used - it may be a multi-table

mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/lowercase_table2.result:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
mysql-test/t/information_schema.test:
  manual merge

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19307

Removed non-static test case


mysql-test/r/partition_mgm.result:
  Removed non-static test case
mysql-test/t/partition_mgm.test:
  Removed non-static test case

into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19307


mysql-test/r/partition.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/partition_info.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_partition.cc:
  Auto merged

into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new


BitKeeper/etc/ignore:
  auto-union
client/mysql.cc:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/table.cc:
  Null-merged, as this doesn't apply after 5.1.4 .  -cm

into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new


include/my_sys.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged

mysql-test/r/partition.result:
  New test case
mysql-test/t/partition.test:
  New test case
sql/partition_info.cc:
  Disable CSV engine for partitioned tables
sql/share/errmsg.txt:
  Update error message for more flexibility
sql/sql_partition.cc:
  Editing fixes

into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19305