bzr push into mysql-5.1-telco-7.0 branch (magnus.blaudd:4330 to 4331)

[Magnus Blåudd]

 4331 Magnus Blåudd	2011-04-20
      ndb
       - mark up patch for BUG 12380149 with MCP tags

    modified:
      sql/sql_partition.cc
 4330 Magnus Blåudd	2011-04-20
      rpl_ndb
             - move rpl_ndb_2multi_basic.test from common location for all rpl tests
              to rpl_ndb suite which is the olny place it's used.
             - rename file ending to .inc and update all .test files which is using it.

    renamed:
      mysql-test/extra/rpl_tests/rpl_ndb_2multi_basic.test => mysql-test/suite/rpl_ndb/t/rpl_ndb_2multi_basic.inc
    modified:
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test
=== modified file 'sql/sql_partition.cc'
--- a/sql/sql_partition.cc	2011-04-08 13:59:44 +0000
+++ b/sql/sql_partition.cc	2011-04-20 12:50:50 +0000
@@ -3737,7 +3737,11 @@ void get_partition_set(const TABLE *tabl
   part_spec->start_part= 0;
   part_spec->end_part= no_parts - 1;
   if ((index < MAX_KEY) && 
-       key_spec && key_spec->flag == (uint)HA_READ_KEY_EXACT &&
+#ifndef MCP_BUG12380149
+      key_spec && key_spec->flag == (uint)HA_READ_KEY_EXACT &&
+#else
+      key_spec->flag == (uint)HA_READ_KEY_EXACT &&
+#endif
        part_info->some_fields_in_PF.is_set(index))
   {
     key_info= table->key_info+index;

No bundle (reason: useless for push emails).