List:Commits« Previous MessageNext Message »
From:Pekka Nousiainen Date:September 18 2011 4:27pm
Subject:bzr push into mysql-5.1-telco-7.0 branch (pekka.nousiainen:4507 to 4532)
View as plain text  
 4532 Jan Wedvik	2011-09-16
      This commit fixes a compilation error on windows (no 'round()' function there).

    modified:
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
 4531 Jan Wedvik	2011-09-16
      This is a fix for two bugs in the algorithm for calculating parallelism for the first batch of a child scan.
      The consequence of these where that parallelism would be set to low for scans with mid-sized (~64 rows) result sets. 

    modified:
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
 4530 jonas oreland	2011-09-15
      ndb - more preparations for mttc

    modified:
      storage/ndb/src/kernel/blocks/LocalProxy.cpp
      storage/ndb/src/kernel/blocks/LocalProxy.hpp
      storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
      storage/ndb/src/kernel/blocks/dbspj/DbspjProxy.hpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcProxy.cpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcProxy.hpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp
      storage/ndb/src/kernel/vm/GlobalData.hpp
      storage/ndb/src/kernel/vm/dummy_nonmt.cpp
      storage/ndb/src/kernel/vm/mt.cpp
      storage/ndb/src/kernel/vm/mt.hpp
 4529 Frazer Clement	2011-09-15 [merge]
      Null merge 6.3->7.0

 4528 Frazer Clement	2011-09-15
      Use more force to stabilise ndb_rpl_conflict_epoch testcase

    modified:
      mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_epoch.result
      mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch_1.inc
 4527 Ole John Aske	2011-09-15
      SPJ api: Cleaned up in signal tracing in order to make it more readable (I think).
      Removed some trace lines which wasn't usefull.
      
      NOTE: Tracing is disabled pr default and require setting 'bool traceSignals = true'
      and a recompile to take effect.

    modified:
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
 4526 Frazer Clement	2011-09-15
      Bug#12859831 IGNORED ERRORS ARE CONSIDERED DELETE OPERETIONS CRASHING SERVER WITH AN ASSERT
      
      Recent code changes as part of read-before-write removal assert 
      that the number of operations that fail due to non-existing keys should
      be <= the number of defined operations *of a single type*.  This works
      well for the normal SQL client handler call patterns, but the Slave SQL
      thread defines operations of multiple types in batches together, which can
      cause these assertions to fail.
      
      No testcase yet.
      
      Not applied to 6.3. 

    modified:
      sql/ha_ndbcluster.cc
 4525 Martin Skold	2011-09-15
      Bug#11755237 Got error 4350 'Transaction already aborted' from NDBCLUSTER: AUTO_INCREMENT not set properly for INSERT IGNORE causing DBUG_ASSERT in handler.cc

    modified:
      mysql-test/suite/ndb/r/ndb_auto_increment.result
      mysql-test/suite/ndb/t/ndb_auto_increment.test
      sql/ha_ndbcluster.cc
 4524 Jonas Oreland	2011-09-15
      ndb - change SPJ instance key handling in TC (preparation for mttc)

    modified:
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
 4523 Jonas Oreland	2011-09-14
      ndb - testMgm fix 2: Be compatible wrt to error messages

    modified:
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
 4522 Jonas Oreland	2011-09-14
      ndb - testMgm fix 1: allow get_config_from(X) where X == id of ndb_mgmd that you connect to

    modified:
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
 4521 Jonas Oreland	2011-09-14
      ndb - 1) Don't allow alloc-node-id before node is allowed to connect 2) Don't let NR-node block alloc-node-id

    modified:
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
 4520 Jan Wedvik	2011-09-14
      This commit implements a negative test for the ndb api extensions for SPJ.
      "Negative" means that the test deliberately uses the api incorrectly, to verify
      that the api handles application errors as it should.
      
      This commit also fixes various errors and limitations in api error handling that were found
      when implementing the negative test. This includes:
      
      * checks for queries with multiple root operations.
      
      * Preventing the data node from crashing if there is an operation
      where 'attfinfo' is empty.
      
      * Flagging certain errors earlier, i.e. when the query definition is built rather than when it is executed.

    modified:
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
      storage/ndb/src/ndbapi/NdbQueryBuilder.cpp
      storage/ndb/src/ndbapi/NdbQueryBuilder.hpp
      storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
      storage/ndb/src/ndbapi/ndberror.c
      storage/ndb/test/ndbapi/testSpj.cpp
 4519 Ole John Aske	2011-09-14
      Previous commit (revno 4518) refactored SPJ result retrieval such that 
      result sets may be double buffered. By a mistake the 'const bool useDoubleBuffers'
      was set to 'false' in that commit which disabled the use of the new feature.
      
      This commit turns it 'on'

    modified:
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
 4518 Ole John Aske	2011-09-13
      Implemented double buffering of SPJ results in order to improve concurrency between datanodes and mysqld.

    modified:
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
      storage/ndb/src/ndbapi/NdbQueryOperationImpl.hpp
 4517 magnus.blaudd@stripped	2011-09-13
      ndb test 
       - trim trailing linefeed from data loaded from file
         before selecting output

    modified:
      mysql-test/suite/ndb/t/ndb_mgm.test
 4516 magnus.blaudd@stripped	2011-09-13 [merge]
      Merge

    modified:
      mysql-test/suite/ndb/r/ndb_mgm.result
      mysql-test/suite/ndb/t/ndb_mgm.test
      storage/ndb/src/kernel/angel.cpp
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
      storage/ndb/src/kernel/vm/Configuration.cpp
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
      storage/ndb/src/mgmsrv/MgmtSrvr.hpp
      storage/ndb/src/mgmsrv/Services.cpp
      storage/ndb/src/mgmsrv/Services.hpp
      storage/ndb/src/ndbapi/ndb_cluster_connection.cpp
      storage/ndb/test/include/NdbMgmd.hpp
      storage/ndb/test/ndbapi/CMakeLists.txt
      storage/ndb/test/ndbapi/Makefile.am
      storage/ndb/test/ndbapi/testMgm.cpp
      storage/ndb/test/ndbapi/testNdbApi.cpp
      storage/ndb/test/tools/CMakeLists.txt
      storage/ndb/test/tools/connect.cpp
 4515 jonas oreland	2011-09-13
      ndb - bug#12974714 - spurious timeout on slave, when using unique indexes (introduced by bug#47952)

    modified:
      mysql-test/suite/ndb_rpl/r/ndb_rpl_ui.result
      mysql-test/suite/ndb_rpl/t/ndb_rpl_ui.test
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
 4514 Jonas Oreland	2011-09-12
      ndb - improve error printout in test/tool/ndb_connect

    modified:
      storage/ndb/test/tools/connect.cpp
 4513 Jan Wedvik	2011-09-09
      This commit concerns pushed queries (i.e. those using the SPJ block).
      
      This commit adds checks to ensure that a pushed query should not have
      more than 32 operations. This is a limit set by the protocol towards the data 
      nodes. (Unique index lookups count as two operations).

    modified:
      storage/ndb/src/ndbapi/NdbQueryBuilder.cpp
      storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp
 4512 Jonas Oreland	2011-09-09
      new files missing from CMakeLists

    modified:
      storage/ndb/src/ndbapi/CMakeLists.txt
 4511 Jonas Oreland	2011-09-09
      ndb - add the multi wait ndbapi extensions (not in public api)

    added:
      storage/ndb/src/ndbapi/NdbWaitGroup.cpp
      storage/ndb/src/ndbapi/NdbWaitGroup.hpp
      storage/ndb/src/ndbapi/WakeupHandler.cpp
      storage/ndb/src/ndbapi/WakeupHandler.hpp
      storage/ndb/test/ndbapi/testAsynchMultiwait.cpp
    modified:
      storage/ndb/include/ndbapi/Ndb.hpp
      storage/ndb/include/ndbapi/ndb_cluster_connection.hpp
      storage/ndb/include/transporter/TransporterCallback.hpp
      storage/ndb/src/common/transporter/TransporterRegistry.cpp
      storage/ndb/src/ndbapi/API.hpp
      storage/ndb/src/ndbapi/Makefile.am
      storage/ndb/src/ndbapi/NdbImpl.hpp
      storage/ndb/src/ndbapi/Ndbif.cpp
      storage/ndb/src/ndbapi/Ndbinit.cpp
      storage/ndb/src/ndbapi/TransporterFacade.cpp
      storage/ndb/src/ndbapi/TransporterFacade.hpp
      storage/ndb/src/ndbapi/ndb_cluster_connection.cpp
      storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp
      storage/ndb/src/ndbapi/trp_client.hpp
      storage/ndb/test/ndbapi/Makefile.am
      storage/ndb/test/run-test/daily-basic-tests.txt
 4510 Jonas Oreland	2011-09-09
      ndb - make sure not to set any more variables for plain old ndbd...or it will be confused

    modified:
      storage/ndb/src/kernel/vm/Configuration.cpp
 4509 Jonas Oreland	2011-09-08
      ndb - fix newly introduced bug, where ACC memory didn't get divided with no of LDM threads

    modified:
      storage/ndb/src/kernel/ndbd.cpp
      storage/ndb/src/kernel/vm/Configuration.cpp
 4508 Frazer Clement	2011-09-07
      WL5353 Primary Cluster conflict resolution - transactional
      
       - A new --ndb-log-transaction-id option is added to the MySQL Server
       - A new NDB$EPOCH_TRANS() conflict detection algorithm is added
       - Five new status variables for tracking the behaviour of transactional 
         conflict detection.
      
      The NDB$EPOCH_TRANS() function is similar to NDB$EPOCH, except that 
      detected conflicts result in rejection and realignment of not just the
      conflicting rows, but their transactions, and any transactions 
      transitively depending on them.  This gives eventually consistent 
      asynchronous replication with cross-row transaction consistency.
      
       

    added:
      mysql-test/suite/ndb_binlog/r/ndb_binlog_log_transaction_id.result
      mysql-test/suite/ndb_binlog/t/ndb_binlog_get_row_extra_data.inc
      mysql-test/suite/ndb_binlog/t/ndb_binlog_log_transaction_id-master.opt
      mysql-test/suite/ndb_binlog/t/ndb_binlog_log_transaction_id.test
      mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_epoch_trans.result
      mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch_trans.cnf
      mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch_trans.test
      mysql-test/suite/ndb_rpl/t/ndb_trans_conflict_info.inc
      mysql-test/suite/ndb_rpl/t/ndb_trans_conflict_info_init.inc
      mysql-test/suite/ndb_rpl/t/ndb_trans_conflict_info_stable.inc
      mysql-test/suite/rpl/r/rpl_extra_row_data.result
      mysql-test/suite/rpl/t/rpl_extra_row_data-master.opt
      mysql-test/suite/rpl/t/rpl_extra_row_data-slave.opt
      mysql-test/suite/rpl/t/rpl_extra_row_data.test
      sql/ndb_conflict_trans.cc
      sql/ndb_conflict_trans.h
      storage/ndb/include/util/HashMap2.hpp
      storage/ndb/include/util/LinkedStack.hpp
      storage/ndb/src/common/util/HashMap2.cpp
      storage/ndb/src/common/util/LinkedStack.cpp
    modified:
      libmysqld/Makefile.am
      mysql-test/suite/ndb/r/ndb_basic.result
      sql/Makefile.am
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbcluster_binlog.h
      sql/log_event.cc
      sql/log_event.h
      sql/ndb_mi.cc
      sql/ndb_mi.h
      sql/rpl_constants.h
      sql/slave.h
      sql/sql_class.cc
      sql/sql_class.h
      storage/ndb/CMakeLists.txt
      storage/ndb/src/common/util/CMakeLists.txt
      storage/ndb/src/common/util/Makefile.am
 4507 jonas oreland	2011-09-07
      ndb - update result file :-(

    modified:
      mysql-test/suite/ndb/r/ndb_basic.result

Diff too large for email (14293 lines, the limit is 10000).
No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1-telco-7.0 branch (pekka.nousiainen:4507 to 4532) Pekka Nousiainen20 Sep