From: Ole John Aske
Date: August 15 2011 12:30pm
Subject: bzr push into mysql-5.1-telco-7.0-spj-scan-vs-scan branch
 (ole.john.aske:3529 to 3530)
List-Archive: http://lists.mysql.com/commits/140622
Message-Id: <20110815123053.650E3218@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3530 Ole John Aske	2011-08-15 [merge]
      merge

    modified:
      mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch.cnf
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
 3529 Jan Wedvik	2011-07-31
      This commit changes ndb_pushed_join::make_query_instance() in two ways:
      1. alloca() is replaced with my_alloca()/my_afree() to ensure portability to platforms with different or missing 
      alloca() implementations.
      2. NdbQueryParamValue are initialized using placement new and a constructor, instead of via the assignment operator. 
      (Using a non-static member of a non-POD class before calling the constructor results in undefined behavior, according
       to the C++ spec.) Also, calls to ~NdbQueryParamValue() are added. Currently, the destructor is trivial, so the 
      compiler will probably optimize this away. But there should be a call to it, in case the class is ever changed. 

    modified:
      sql/ha_ndbcluster_push.cc
=== modified file 'mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch.cnf'
--- a/mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch.cnf	2011-07-07 14:48:06 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch.cnf	2011-07-11 10:40:00 +0000
@@ -25,14 +25,7 @@ skip-slave-start
 [mysqld.2.slave]
 server-id= 4
 log-bin = sec-master-2
-master-host=		127.0.0.1
-master-port=		@mysqld.2.1.port
-master-password=	@mysqld.2.1.#password
-master-user=		@mysqld.2.1.#user
-master-connect-retry=	1
-init-rpl-role=		slave
 skip-slave-start
-ndb_connectstring=	@mysql_cluster.slave.ndb_connectstring
 
 [ENV]
 

=== modified file 'storage/ndb/src/ndbapi/NdbQueryOperation.cpp'
--- a/storage/ndb/src/ndbapi/NdbQueryOperation.cpp	2011-07-04 07:46:44 +0000
+++ b/storage/ndb/src/ndbapi/NdbQueryOperation.cpp	2011-08-15 12:27:33 +0000
@@ -3302,9 +3302,9 @@ NdbQueryImpl::OrderedFragSet::getEmpty()
 bool 
 NdbQueryImpl::OrderedFragSet::verifySortOrder() const
 {
-  for(int i = 0; i<m_activeFragCount-2; i++)
+  for (int i = 0; i<m_activeFragCount-1; i++)
   {
-    if(compare(*m_activeFrags[i], *m_activeFrags[i+1]) < 0)
+    if (compare(*m_activeFrags[i], *m_activeFrags[i+1]) < 0)
     {
       assert(false);
       return false;
@@ -3736,7 +3736,7 @@ NdbQueryOperationImpl::nextResult(bool f
 void 
 NdbQueryOperationImpl::fetchRow(NdbResultStream& resultStream)
 {
-  const char* buff = resultStream.getReceiver().get_row();
+  const char* buff = resultStream.getReceiver().peek_row();
   assert(buff!=NULL || (m_firstRecAttr==NULL && m_ndbRecord==NULL));
 
   m_isRowNull = false;

No bundle (reason: useless for push emails).