List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:June 21 2011 2:03pm
Subject:bzr push into mysql-5.1-telco-7.0 branch (magnus.blaudd:4410 to 4457)
View as plain text  
 4457 Magnus Blåudd	2011-06-20
      ndb
       - rename the lib built in mgmcommon to ndbmgmcommon instead of ndbmgmsrv

    modified:
      storage/ndb/src/CMakeLists.txt
      storage/ndb/src/common/mgmcommon/CMakeLists.txt
      storage/ndb/src/kernel/CMakeLists.txt
 4456 Magnus Blåudd	2011-06-20
      ndb
       - Prefix all values in OpTypes enum  with OP_ to avoid nameclash(with for example DELETE)

    modified:
      storage/ndb/test/ndbapi/testBasic.cpp
 4455 Magnus Blåudd	2011-06-13
      ndb
       - remove unused include of DbinfoScan.hpp

    modified:
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
 4454 Jonas Oreland	2011-06-13
      ndb - bug#12651364/mysql-bug-61498 - Ignore mixed version when subscribing to first event

    modified:
      storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
      storage/ndb/src/ndbapi/ndberror.c
 4453 magnus.blaudd@stripped	2011-06-13 [merge]
      Merge 6.3 -> 7.0

    modified:
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
 4452 jonas oreland	2011-06-10
      ndb - improve DBUG_REDO printouts

    modified:
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
 4451 jonas oreland	2011-06-10
      ndb autotest - cleanup formatting, and return to $PWD after building

    modified:
      storage/ndb/test/run-test/autotest-boot.sh
 4450 Jonas Oreland	2011-06-10
      ndb - fix (rare) timeout problem with SR_DD_* due to excessive amount of old backup

    modified:
      storage/ndb/test/ndbapi/testSystemRestart.cpp
      storage/ndb/test/src/NdbBackup.cpp
 4449 Jonas Oreland	2011-06-10
      ndb - fix compile error for configs which does not have rmb/wmb

    modified:
      storage/ndb/src/kernel/vm/NdbSeqLock.hpp
 4448 magnus.blaudd@stripped	2011-06-09
      Bug#37153 NDB Cluster reports affected rows incorrectly
       - This is a rewrite of the previous fix which commits the simple
         autocommit transaction before the update or delete loops asks
         the handler for number of affected rows. Thus still saving one
         roundtrip while returning the correct number of affected rows.
        
       - Refactor the compound if statements in exec_bulk_update and
         end_bulk_delete which controls when to no-commit or not.
         Adding DBUG_PRINT so it's possible to see
         which path is choosen when optimizing away roundtrips

    modified:
      sql/ha_ndbcluster.cc
      sql/sql_class.cc
      sql/sql_class.h
 4447 magnus.blaudd@stripped	2011-06-08
      ndb
       - remove usage r --init-rpl-role and --rpl-recovery-rank, thay are
          unused/unimplemented and will be removed in a future version anyway. 

    modified:
      mysql-test/suite/ndb_rpl/my.cnf
      mysql-test/suite/ndb_rpl/t/ndb_rpl_break_3_chain.cnf
      mysql-test/suite/ndb_rpl/t/ndb_rpl_multi_binlog_update.cnf
      mysql-test/suite/ndb_team/my.cnf
      mysql-test/suite/rpl_ndb/my.cnf
 4446 magnus.blaudd@stripped	2011-06-07
      ndb
       - remove usage of my_malloc and my_free from ndbapi

    modified:
      storage/ndb/src/ndbapi/NdbIndexStatImpl.cpp
 4445 magnus.blaudd@stripped	2011-06-07
      ndb - fix warning about conversion between different datatypes

    modified:
      storage/ndb/src/ndbapi/NdbIndexStatImpl.cpp
 4444 magnus.blaudd@stripped	2011-06-07 [merge]
      Merge

    modified:
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
 4443 magnus.blaudd@stripped	2011-06-07
      ndb
       - move reset of m_is_bulk_delete flag to top of function, thus
        avoiding that it have to be reset in every if branch of the function

    modified:
      sql/ha_ndbcluster.cc
 4442 magnus.blaudd@strippedom	2011-06-07 [merge]
      Merge

    modified:
      storage/ndb/src/common/portlib/CMakeLists.txt
      storage/ndb/src/common/util/ndbzio.c
 4441 Jan Wedvik	2011-06-07
      This fix only applies to pushed queries (i.e. those using NdbQuery and the SPJ block).
      
      This commit fixes an error related to bushy scans where the right hand side (i.e. the scan that is executed
      several times for genrating a cross product) used pruning. The algoritm for couning how many fragments to scan
      only worked correctly for the first execution. The second execution would typically cause an assert.

    modified:
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
 4440 jonas oreland	2011-06-07 [merge]
      ndb - wl4124 - merge ndbapi part into 70

    added:
      storage/ndb/src/ndbapi/NdbIndexStatImpl.cpp
      storage/ndb/src/ndbapi/NdbIndexStatImpl.hpp
      storage/ndb/tools/ndb_index_stat.cpp
    modified:
      sql/ha_ndbcluster.cc
      storage/ndb/include/ndbapi/NdbApi.hpp
      storage/ndb/include/ndbapi/NdbDictionary.hpp
      storage/ndb/include/ndbapi/NdbIndexStat.hpp
      storage/ndb/src/kernel/blocks/trix/Trix.cpp
      storage/ndb/src/ndbapi/API.hpp
      storage/ndb/src/ndbapi/CMakeLists.txt
      storage/ndb/src/ndbapi/Makefile.am
      storage/ndb/src/ndbapi/NdbDictionary.cpp
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
      storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
      storage/ndb/src/ndbapi/NdbIndexStat.cpp
      storage/ndb/src/ndbapi/Ndberr.cpp
      storage/ndb/src/ndbapi/Ndbif.cpp
      storage/ndb/src/ndbapi/ndberror.c
      storage/ndb/test/ndbapi/testIndexStat.cpp
      storage/ndb/test/run-test/daily-basic-tests.txt
      storage/ndb/tools/Makefile.am
 4439 jonas oreland	2011-06-07
      ndb - fix 2 more upgrade problems with index-stat code

    modified:
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
 4438 jonas oreland	2011-06-07
      ndb - fix tux upgrade with ndb_mgmd not having index-stat-options

    modified:
      storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp
 4437 jonas oreland	2011-06-01
      ndb - remove another windows breaks solaris feture from autotest

    modified:
      storage/ndb/test/run-test/atrt-gather-result.sh
 4436 jonas oreland	2011-06-01
      ndb - add "|| true" to support sh -e

    modified:
      storage/ndb/test/run-test/atrt-backtrace.sh
      storage/ndb/test/run-test/atrt-gather-result.sh
      storage/ndb/test/run-test/atrt-setup.sh
      storage/ndb/test/run-test/autotest-boot.sh
      storage/ndb/test/run-test/autotest-run.sh
 4435 jonas oreland	2011-06-01
      ndb - remove usage of non-standard grep options added by autotest for windows project

    modified:
      storage/ndb/test/run-test/atrt-backtrace.sh
      storage/ndb/test/run-test/atrt-gather-result.sh
      storage/ndb/test/run-test/atrt-setup.sh
      storage/ndb/test/run-test/autotest-boot.sh
      storage/ndb/test/run-test/autotest-run.sh
 4434 jonas oreland	2011-06-01 [merge]
      ndb - merge 63 to 70

    modified:
      storage/ndb/include/transporter/TransporterRegistry.hpp
      storage/ndb/src/common/transporter/Transporter.cpp
      storage/ndb/src/common/transporter/Transporter.hpp
      storage/ndb/src/common/transporter/TransporterRegistry.cpp
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
      storage/ndb/src/mgmsrv/MgmtSrvr.hpp
      storage/ndb/src/mgmsrv/Services.cpp
 4433 Jonas Oreland	2011-05-31
      ndb - remove warnings in new index-stat code

    modified:
      storage/ndb/src/kernel/blocks/trix/Trix.cpp
 4432 Jonas Oreland	2011-05-31
      ndb - supress warning events when discovering that ndb_index_stat table does not exist

    modified:
      storage/ndb/src/kernel/blocks/trix/Trix.cpp
      storage/ndb/src/kernel/blocks/trix/Trix.hpp
 4431 Jonas Oreland	2011-05-31
      ndb - remove bash-ism in autotest-run.sh

    modified:
      storage/ndb/test/run-test/autotest-run.sh
 4430 Jonas Oreland	2011-05-31 [merge]
      ndb - merge 63 to 70

    modified:
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
      storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
      storage/ndb/src/kernel/blocks/suma/Suma.cpp
      storage/ndb/src/kernel/blocks/suma/Suma.hpp
 4429 Jonas Oreland	2011-05-31
      ndb - fix weird solaris gcc3.4.3 compile error

    modified:
      storage/ndb/test/ndbapi/testRestartGci.cpp
 4428 Jonas Oreland	2011-05-31 [merge]
      ndb - wl4124 - kernel part

    added:
      storage/ndb/include/kernel/signaldata/IndexStatSignal.hpp
      storage/ndb/src/common/debugger/signaldata/IndexStatSignal.cpp
    modified:
      storage/ndb/include/kernel/AttributeHeader.hpp
      storage/ndb/include/kernel/GlobalSignalNumbers.h
      storage/ndb/include/kernel/ndb_limits.h
      storage/ndb/include/kernel/signaldata/AccScan.hpp
      storage/ndb/include/kernel/signaldata/ScanFrag.hpp
      storage/ndb/include/kernel/signaldata/SignalData.hpp
      storage/ndb/include/kernel/signaldata/SumaImpl.hpp
      storage/ndb/include/kernel/signaldata/TuxBound.hpp
      storage/ndb/include/kernel/signaldata/TuxContinueB.hpp
      storage/ndb/include/kernel/signaldata/UtilRelease.hpp
      storage/ndb/include/mgmapi/mgmapi_config_parameters.h
      storage/ndb/include/ndb_constants.h
      storage/ndb/src/common/debugger/signaldata/CMakeLists.txt
      storage/ndb/src/common/debugger/signaldata/Makefile.am
      storage/ndb/src/common/debugger/signaldata/ScanFrag.cpp
      storage/ndb/src/common/debugger/signaldata/SchemaTransImpl.cpp
      storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp
      storage/ndb/src/common/debugger/signaldata/SignalNames.cpp
      storage/ndb/src/kernel/blocks/ERROR_codes.txt
      storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
      storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp
      storage/ndb/src/kernel/blocks/dbtux/DbtuxBuild.cpp
      storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp
      storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp
      storage/ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp
      storage/ndb/src/kernel/blocks/dbtux/DbtuxProxy.cpp
      storage/ndb/src/kernel/blocks/dbtux/DbtuxProxy.hpp
      storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp
      storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp
      storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp
      storage/ndb/src/kernel/blocks/suma/Suma.cpp
      storage/ndb/src/kernel/blocks/suma/Suma.hpp
      storage/ndb/src/kernel/blocks/trix/Trix.cpp
      storage/ndb/src/kernel/blocks/trix/Trix.hpp
      storage/ndb/src/mgmsrv/ConfigInfo.cpp
      storage/ndb/src/ndbapi/ndberror.c
      storage/ndb/tools/restore/Restore.cpp
 4427 Jonas Oreland	2011-05-30
      ndb - kill warnings for gcc 4.4.3

    modified:
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
      storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp
      storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp
      storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp
      storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp
      storage/ndb/src/kernel/blocks/suma/Suma.cpp
 4426 jonas oreland	2011-05-27
      ndb - move refresh tests into daily-basic...as daily-devel isn't closely monitored

    modified:
      storage/ndb/test/run-test/daily-basic-tests.txt
      storage/ndb/test/run-test/daily-devel-tests.txt
 4425 jonas oreland	2011-05-27
      ndb - fix bug with batch size increase/decrease

    modified:
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
 4424 Jan Wedvik	2011-05-26
      This commit concerns pushed queries (those using NdbQuery etc.).
      This is a fix for an error that would occur when pushing an index scan that is sorted on a string field.
      The problem was an assumption that compare_ndbrecord() would always return 0,-1 or 1, when it can in fact return any
      number. This could cause results to be sorted in the wrong order, or mysqld to loop for ever.

    modified:
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
 4423 Jonas Oreland	2011-05-26
      ndb - fix bug in DbtcProxy...worker instances are named 1..N

    modified:
      storage/ndb/src/kernel/blocks/dbtc/DbtcProxy.cpp
 4422 Jonas Oreland	2011-05-26
      ndb - fix node-failure for Dbtc/DbtcProxy

    modified:
      storage/ndb/src/kernel/blocks/LocalProxy.cpp
      storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcProxy.cpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcProxy.hpp
 4421 Jonas Oreland	2011-05-26
      ndb - implement support for multi DIVERIFY_queue's

    modified:
      storage/ndb/include/kernel/ndb_limits.h
      storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
 4420 Jonas Oreland	2011-05-26
      ndb fix incorrect assertion (only in mt case...seen in real life)

    modified:
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
 4419 Frazer Clement	2011-05-25
      WL5353 Primary Cluster Conflict Resolution
      
      Include NdbApi transaction ids with data change events.
      
      A new method, getTransId() is added to the NdbEventOperation class.
      For data change events (INSERT, UPDATE, DELETE), this method returns the
      transaction id of the NdbApi transaction which caused the event.  This
      is the same transaction id as returned by NdbTrasaction::getTransactionId()
      when executing the transaction.
      
      Existing NdbApi event testcases are augmented to verify that the transaction
      id is passed through the cluster as expected.

    modified:
      storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp
      storage/ndb/include/kernel/signaldata/SumaImpl.hpp
      storage/ndb/include/kernel/signaldata/TupCommit.hpp
      storage/ndb/include/ndbapi/NdbEventOperation.hpp
      storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
      storage/ndb/src/kernel/blocks/suma/Suma.cpp
      storage/ndb/src/ndbapi/NdbEventOperation.cpp
      storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
      storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp
      storage/ndb/test/include/HugoOperations.hpp
      storage/ndb/test/ndbapi/test_event.cpp
      storage/ndb/test/src/HugoOperations.cpp
 4418 Frazer Clement	2011-05-25
      WL5353 Primary Cluster Conflict Resolution
      
      Implementation of refreshTuple() mechanism.
      
      A new operation type, refreshTuple() is defined.
      When executed, it causes an NdbApi data change event to be 
      generated for the affected row.
      If the row does not exist, a DELETE event, with the primary key,
      is generated.
      If the row does exist, an INSERT event, with the primary key and
      all values is generated.
      
      A refreshTuple() operation must be the last operation on a particular 
      tuple in a transaction.  An error will be returned if any other operation
      (including refreshTuple) is defined on a refreshed row in a transaction.
      
      refreshTuple() does not currently support tables with BLOB columns.

    modified:
      storage/ndb/include/kernel/kernel_types.h
      storage/ndb/include/ndb_version.h.in
      storage/ndb/include/ndbapi/NdbOperation.hpp
      storage/ndb/include/ndbapi/NdbTransaction.hpp
      storage/ndb/src/common/debugger/signaldata/TcKeyReq.cpp
      storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp
      storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.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/DbtupTrigger.cpp
      storage/ndb/src/ndbapi/NdbOperationExec.cpp
      storage/ndb/src/ndbapi/NdbTransaction.cpp
      storage/ndb/src/ndbapi/ndberror.c
      storage/ndb/test/include/HugoOperations.hpp
      storage/ndb/test/include/HugoTransactions.hpp
      storage/ndb/test/ndbapi/testBasic.cpp
      storage/ndb/test/ndbapi/testIndex.cpp
      storage/ndb/test/run-test/daily-devel-tests.txt
      storage/ndb/test/src/HugoOperations.cpp
      storage/ndb/test/src/HugoTransactions.cpp
      storage/ndb/test/tools/hugoPkUpdate.cpp
 4417 Jonas Oreland	2011-05-25
      ndb - allow spj/tc to do cross-thread execute-direct for DIGETNODES/DIVERIFYREQ

    modified:
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
 4416 Jonas Oreland	2011-05-25
      ndb - implement a thread-safe emptyverificbuffer

    modified:
      storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
 4415 Jonas Oreland	2011-05-25
      ndb - add "locking"(NdbSeqLock) for mt-DIVERIFYREQ

    modified:
      storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
 4414 Jonas Oreland	2011-05-25
      ndb - add "locking"(NdbSeqLock) for mt-DIGETNODES

    modified:
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
 4413 Jonas Oreland	2011-05-25
      ndb - change implementation of DIVERIFY_queue to be a srsw array based queue (easy to make thread safe) instead of linked-list

    modified:
      storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
 4412 Jonas Oreland	2011-05-25
      ndb - mttc - increase obfuscation by passing an EmulatedJamBuffer* in signal->theData for DIGETNODESREQ and DIVERIFYREQ. This to allow these two signals to be called from different threads (execute direct)

    modified:
      storage/ndb/include/kernel/signaldata/DiGetNodes.hpp
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
 4411 jonas oreland	2011-05-24 [merge]
      ndb - merge 63 to 70

    modified:
      storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
 4410 magnus.blaudd@stripped	2011-05-24 [merge]
      Merge

    modified:
      CMakeLists.txt

Diff too large for email (19903 lines, the limit is 10000).
No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1-telco-7.0 branch (magnus.blaudd:4410 to 4457) Magnus Blåudd21 Jun