bzr push into mysql-5.1-telco-6.3 branch (frazer:2898 to 2899)

[Frazer Clement]

 2899 Frazer Clement	2009-03-09 [merge]
      Merge 6.2->6.3
      modified:
        mysql-test/suite/rpl_ndb/t/rpl_ndbapi_multi.test

 2898 Frazer Clement	2009-03-06
      Bug#37934 Partition pruning doesn't work for all queries in DBT2
      
      Per-range partitioning information is added to the IndexBound API.
      Each bound can have individual partition specification.
      If all bounds in a Multi Range Read Scan have the same partitioning
      information then the MRR scan can be pruned to a single partition.
      This also applies to partitioning information determined internally
      by the NDBAPI - e.g. when NDBAPI determines that a range is bounded
      by a single value of the table's distribution keys.  If all ranges
      in an MRR scan are similarly bounded, the MRR scan will be 
      automatically pruned.
      
      When UserDefined partitioning schemes are used, ha_ndbcluster.cc 
      now passes explicit per-range partitioning information down to 
      NDBAPI.
      
      storage/ndb/testPartitioning is extended to improve support for
      UserDefined partitioned tables and MRR scans where all range bounds
      are contained within a single table partition.
      
      This work also builds on some Blob part partitioning fixes made in
      Bug#34268.
      added:
        mysql-test/suite/ndb/r/ndb_partition_hash.result
        mysql-test/suite/ndb/t/ndb_partition_hash.test
      modified:
        sql/ha_ndbcluster.cc
        storage/ndb/include/ndbapi/Ndb.hpp
        storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp
        storage/ndb/include/ndbapi/NdbOperation.hpp
        storage/ndb/include/ndbapi/NdbScanOperation.hpp
        storage/ndb/src/ndbapi/Ndb.cpp
        storage/ndb/src/ndbapi/NdbOperationSearch.cpp
        storage/ndb/src/ndbapi/NdbScanOperation.cpp
        storage/ndb/src/ndbapi/ndberror.c
        storage/ndb/test/include/HugoOperations.hpp
        storage/ndb/test/ndbapi/testPartitioning.cpp
        storage/ndb/test/src/HugoOperations.cpp
        storage/ndb/test/src/HugoTransactions.cpp

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndbapi_multi.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndbapi_multi.test	2007-12-12 17:19:24 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndbapi_multi.test	2009-03-09 16:04:09 +0000
@@ -2,6 +2,7 @@
 -- source include/have_binlog_format_mixed_or_row.inc
 -- source include/have_ndbapi_examples.inc
 -- source include/ndb_master-slave.inc
+--let MASTER_MYSOCK=`select @@socket`;
 
 --exec echo Running ndbapi_simple_dual
 --exec $NDB_EXAMPLES_DIR/ndbapi_simple_dual/ndbapi_simple_dual $MASTER_MYSOCK "$NDB_CONNECTSTRING" $SLAVE_MYSOCK "$NDB_CONNECTSTRING_SLAVE" >> $NDB_EXAMPLES_OUTPUT