From: Ole John Aske
Date: April 27 2011 9:06am
Subject: bzr push into mysql-5.1-telco-7.0-spj-scan-vs-scan branch
 (ole.john.aske:3483 to 3484)
List-Archive: http://lists.mysql.com/commits/136173
Message-Id: <20110427090627.2BD2A222@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3484 Ole John Aske	2011-04-27
      Fixed yet another 'Unused variable' compiler warning ....

    modified:
      sql/ha_ndbcluster_push.cc
 3483 Ole John Aske	2011-04-27 [merge]
      Merge mysql-5.1-telco-7.0 -> SPJ

    added:
      mysql-test/suite/rpl_ndb/combinations
      mysql-test/suite/rpl_ndb/t/check_conversions.inc
      storage/ndb/test/run-test/conf-blade08.cnf
    renamed:
      mysql-test/extra/rpl_tests/rpl_ndb_2multi_basic.test => mysql-test/suite/rpl_ndb/t/rpl_ndb_2multi_basic.inc
      mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test => mysql-test/suite/rpl_ndb/t/rpl_ndb_2multi_eng.inc
      mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test => mysql-test/suite/rpl_ndb/t/rpl_ndb_xxx_innodb.inc
      mysql-test/extra/rpl_tests/select_ndb_apply_status.inc => mysql-test/suite/rpl_ndb/t/select_ndb_apply_status.inc
      storage/ndb/include/util/azlib.h => storage/ndb/include/util/ndbzio.h
      storage/ndb/src/common/util/azio.c => storage/ndb/src/common/util/ndbzio.c
    modified:
      configure.in
      mysql-test/mysql-test-run.pl
      mysql-test/suite/rpl_ndb/my.cnf
      mysql-test/suite/rpl_ndb/r/rpl_ndb_2other.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_break_3_chain.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_typeconv_all.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_typeconv_lossy.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_typeconv_nonlossy.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_typeconv_strict.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_break_3_chain.cnf
      mysql-test/suite/rpl_ndb/t/rpl_ndb_break_3_chain.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_all.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_lossy.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_nonlossy.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_strict.test
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/sql_partition.cc
      storage/ndb/include/kernel/kernel_types.h
      storage/ndb/include/kernel/signaldata/AccLock.hpp
      storage/ndb/include/kernel/signaldata/NextScan.hpp
      storage/ndb/ndb_configure.m4
      storage/ndb/src/common/debugger/signaldata/AccLock.cpp
      storage/ndb/src/common/util/CMakeLists.txt
      storage/ndb/src/common/util/Makefile.am
      storage/ndb/src/kernel/blocks/backup/read.cpp
      storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp
      storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
      storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhProxy.cpp
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp
      storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp
      storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp
      storage/ndb/src/kernel/blocks/lgman.cpp
      storage/ndb/src/kernel/blocks/ndbfs/AsyncIoThread.hpp
      storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
      storage/ndb/src/kernel/blocks/ndbfs/PosixAsyncFile.cpp
      storage/ndb/src/kernel/blocks/ndbfs/PosixAsyncFile.hpp
      storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp
      storage/ndb/src/kernel/vm/mt.cpp
      storage/ndb/src/mgmsrv/ConfigInfo.cpp
      storage/ndb/src/ndbapi/NdbScanOperation.cpp
      storage/ndb/test/ndbapi/testDict.cpp
      storage/ndb/test/run-test/Makefile.am
      storage/ndb/test/run-test/daily-basic-tests.txt
      storage/ndb/test/src/HugoCalculator.cpp
      storage/ndb/tools/restore/Restore.cpp
      storage/ndb/tools/restore/Restore.hpp
      mysql-test/suite/rpl_ndb/t/rpl_ndb_xxx_innodb.inc
      storage/ndb/include/util/ndbzio.h
      storage/ndb/src/common/util/ndbzio.c
=== modified file 'sql/ha_ndbcluster_push.cc'
--- a/sql/ha_ndbcluster_push.cc	2011-04-27 08:16:37 +0000
+++ b/sql/ha_ndbcluster_push.cc	2011-04-27 09:06:08 +0000
@@ -1032,8 +1032,7 @@ ndb_pushed_builder_ctx::build_key(const 
                                   const NdbQueryOperand *op_key[])
 {
   DBUG_ENTER("build_key");
-  const uint tab_no= table->get_access_no();
-  DBUG_ASSERT(m_join_scope.contain(tab_no));
+  DBUG_ASSERT(m_join_scope.contain(table->get_access_no()));
 
   const KEY* const key= &table->get_table()->key_info[table->get_index_no()];
   op_key[0]= NULL;

No bundle (reason: useless for push emails).