------------------------------------------------------------
revno: 3840
committer: Bjorn Munch <bjorn.munch@oracle.com>
branch nick: clu-725
timestamp: Wed 2012-03-14 10:48:06 +0100
message:
  Re-applied patches from 7.2.4-release
------------------------------------------------------------
revno: 3839 [merge]
tags: clone-mysql-5.5.20-ndb-7.2.5-src-build
committer: Jonas Oreland <jonas.oreland@oracle.com>
branch nick: cluster-7.2
timestamp: Mon 2012-03-12 10:57:10 +0100
message:
  ndb - merge 71 to 72
    ------------------------------------------------------------
    revno: 2555.698.247 [merge]
    committer: Jonas Oreland <jonas.oreland@oracle.com>
    branch nick: telco-7.1
    timestamp: Mon 2012-03-12 10:55:36 +0100
    message:
      ndb - merge 70 to 71
        ------------------------------------------------------------
        revno: 2555.732.12
        tags: clone-mysql-5.1.61-ndb-7.0.31-src-build
        committer: Jonas Oreland <jonas.oreland@oracle.com>
        branch nick: telco-7.0
        timestamp: Fri 2012-03-09 14:24:50 +0100
        message:
          ndb - add mapping table for MaxNoOfExecutionThreads to thread-types
------------------------------------------------------------
revno: 3838 [merge]
committer: Jonas Oreland <jonas.oreland@oracle.com>
branch nick: cluster-7.2
timestamp: Mon 2012-03-12 10:22:04 +0100
message:
  ndb - merge 71 to 72
    ------------------------------------------------------------
    revno: 2555.698.246
    tags: clone-mysql-5.1.61-ndb-7.0.20-src-build
    committer: Jonas Oreland <jonas.oreland@oracle.com>
    branch nick: telco-7.1
    timestamp: Mon 2012-03-12 10:17:58 +0100
    message:
      ndb - cmake - add quotes not to break cmake-2.6 build(looks fishy anyway btw)
    ------------------------------------------------------------
    revno: 2555.698.245
    committer: Craig L Russell <Craig.Russell@oracle.com>
    branch nick: mysql-5.1-telco-7.1
    timestamp: Sat 2012-03-10 11:39:46 -0800
    message:
      Use SmartValueHandler for find and load operations for clusterj.
      Find, load, and newInstance now create a SmartValueHandler containing an NdbRecord
      to hold values read from the database. SmartValueHandler uses readTuple to
      read values from the database directly into the NdbRecord. No additional
      copying of values is done.
    ------------------------------------------------------------
    revno: 2555.698.244
    committer: Craig L Russell <Craig.Russell@oracle.com>
    branch nick: mysql-5.1-telco-7.1
    timestamp: Fri 2012-03-09 14:29:31 -0800
    message:
      Allow use of Text columns with String types and Blob columns with char[] types without @Lob annotation.
      Suggestion from mysql forum http://forums.mysql.com/read.php?25,519292,519356#msg-519356
------------------------------------------------------------
revno: 3837 [merge]
committer: Jonas Oreland <jonas.oreland@oracle.com>
branch nick: cluster-7.2
timestamp: Fri 2012-03-09 16:37:45 +0100
message:
  ndb - merge 70-spj-spj into 7.2
    ------------------------------------------------------------
    revno: 2555.678.718
    committer: Jonas Oreland <jonas.oreland@oracle.com>
    branch nick: 70-spj-svs
    timestamp: Fri 2012-03-09 16:35:36 +0100
    message:
      ndb - fix compiler warning in error-inserts
    ------------------------------------------------------------
    revno: 2555.678.717
    committer: jonas oreland <jonas.oreland@oracle.com>
    branch nick: 70-spj-svs
    timestamp: Wed 2012-03-07 07:23:54 +0100
    message:
      ndb - silence compiler warning
    ------------------------------------------------------------
    revno: 2555.678.716
    committer: Ole John Aske <ole.john.aske@oracle.com>
    branch nick: mysql-5.1-telco-7.0-spj-scan-scan
    timestamp: Tue 2012-03-06 16:04:01 +0100
    message:
      SPJ error handling: Fixed incorrect check for 'state == RUNNING'.
      As state can be both RUNNING and ABORTING, we have to change these test
      to '!= ABORTING'
    ------------------------------------------------------------
    revno: 2555.678.715
    committer: Ole John Aske <ole.john.aske@oracle.com>
    branch nick: mysql-5.1-telco-7.0-spj-scan-scan
    timestamp: Tue 2012-03-06 13:41:18 +0100
    message:
      SPJ error handling, Followup to previous commit:
      
      Take advantage of that DEBUG_CRASH() is not any longer used in case of
      (simulated) 'out of memory' errors. Inserted errors can then be cleared
      immediately, and the later 'CLEAR_ERROR_INSERT_VALUE' in Dbspj::cleanup()
      becomes obsolete.
    ------------------------------------------------------------
    revno: 2555.678.714
    committer: Ole John Aske <ole.john.aske@oracle.com>
    branch nick: mysql-5.1-telco-7.0-spj-scan-scan
    timestamp: Tue 2012-03-06 13:30:58 +0100
    message:
      SPJ error handling: Remove usage of DEBUG_CRASH() where we have
      less serious errors like out of memory. 
      We still DEBUG_CRASH in case of illegal or
      inconsistent Request or QueryTree
      
      
       - Replace a lot of DEBUG_CRASH() with jam() in 'out of memory'
         situations which are now handled by SPJ.
       - Replace a lot of DEBUG_CRASH() with jam() when catching error
         return from functions which has their own DEBUG_CRASH() in
         case of 'illegal<foo>' errors.
       - Added a few more jam() in order to handle the 3 different
         TreeNode types more similar wrt. jam trace
       - Fixed a single instance where OutOfSectionMemory was
         returned instead of InvalidPattern
       - Removed some obsolete 'break' after a return
------------------------------------------------------------
revno: 3836
committer: Martin Zaun <martin.zaun@oracle.com>
branch nick: ndb-7.2-jtie-merge
timestamp: Wed 2012-03-07 16:26:05 -0800
message:
  ndbjtie - merged 71 to 72 (removed 1 overlooked file).
------------------------------------------------------------
revno: 3835 [merge]
committer: Martin Zaun <martin.zaun@oracle.com>
branch nick: ndb-7.2-jtie-merge
timestamp: Wed 2012-03-07 16:19:35 -0800
message:
  ndbjtie - merged 71 to 72 (with --weave).
    ------------------------------------------------------------
    revno: 2555.698.243 [merge]
    committer: Martin Zaun <martin.zaun@oracle.com>
    branch nick: ndb-7.1-jtie-merge
    timestamp: Wed 2012-03-07 16:03:18 -0800
    message:
      ndbjtie - platform and unit-test fixes.
------------------------------------------------------------
revno: 3834 [merge]
committer: Martin Zaun <martin.zaun@oracle.com>
branch nick: ndb-7.2-jtie-merge
timestamp: Wed 2012-03-07 16:08:36 -0800
message:
  ndbjtie - merged 71 to 72; resolved conflicts in ndbjtie CMakeLists.txt files.
    ------------------------------------------------------------
    revno: 3826.1.2
    committer: Martin Zaun <martin.zaun@oracle.com>
    branch nick: ndb-7.2-jtie-platform-fixes
    timestamp: Mon 2012-03-05 00:14:47 -0800
    message:
      ndbjtie X.X testing - merge from 7.1 platform/unittest fixes
    ------------------------------------------------------------
    revno: 3826.1.1 [merge]
    committer: Martin Zaun <martin.zaun@oracle.com>
    branch nick: ndb-7.2-jtie-platform-fixes
    timestamp: Sun 2012-03-04 23:24:11 -0800
    message:
      ndbjtie X.X testing - merge from 7.1 platform/unittest fixes
        ------------------------------------------------------------
        revno: 2555.734.1
        committer: Martin Zaun <martin.zaun@oracle.com>
        branch nick: ndb-7.1-jtie-platform-fixes
        timestamp: Sun 2012-03-04 20:19:09 -0800
        message:
          ndbjtie X.X testing - platform/unittest fixes
------------------------------------------------------------
revno: 3833 [merge]
committer: Martin Skold <Martin.Skold@oracle.com>
branch nick: mysql-5.5-cluster-7.2
timestamp: Wed 2012-03-07 13:38:54 +0100
message:
  Merge from 71
    ------------------------------------------------------------
    revno: 2555.698.242 [merge]
    committer: Martin Skold <Martin.Skold@oracle.com>
    branch nick: mysql-5.1-telco-7.1
    timestamp: Wed 2012-03-07 13:28:35 +0100
    message:
      Merge from 70
        ------------------------------------------------------------
        revno: 2555.732.11
        committer: Martin Skold <Martin.Skold@oracle.com>
        branch nick: mysql-5.1-telco-7.0
        timestamp: Wed 2012-03-07 13:19:58 +0100
        message:
          Bug#13731134  AUTO-INC COUNTER IS NOT UPDATED WITH EXPLICIT @@INSERT_ID SET: Setting auto_increment in Ndb directly
        ------------------------------------------------------------
        revno: 2555.732.10
        committer: Mauritz Sundell <mauritz.sundell@oracle.com>
        branch nick: mysql-5.1-telco-7.0-debug
        timestamp: Wed 2012-03-07 12:50:14 +0100
        message:
          ndb - fix of signal log serialization
          
          Previously, setting NDB_SIGNAL_LOG_MUTEX can be used to serialize writes
          to signal log, that protects against interleaving several signal
          descriptions with each other.  But flush request was not serialized,
          leading to potential loss or repetition of parts of signal descriptions.
          
          Now, both flushes and writes are serialized when NDB_SIGNAL_LOG_MUTEX
          are set.
    ------------------------------------------------------------
    revno: 2555.698.241
    committer: Craig L Russell <Craig.Russell@oracle.com>
    branch nick: mysql-5.1-telco-7.1
    timestamp: Tue 2012-03-06 12:33:43 -0800
    message:
      Fake commit to force club rebuild
    ------------------------------------------------------------
    revno: 2555.698.240
    committer: Craig L Russell <Craig.Russell@oracle.com>
    branch nick: mysql-5.1-telco-7.1
    timestamp: Tue 2012-03-06 08:51:07 -0800
    message:
      Synchronize dictionary when creating NdbRecord
------------------------------------------------------------
revno: 3832 [merge]
committer: John David Duncan <john.duncan@oracle.com>
branch nick: mysql-5.5-cluster-7.2
timestamp: Tue 2012-03-06 19:59:28 -0800
message:
  Merge
    ------------------------------------------------------------
    revno: 3818.1.7
    committer: John David Duncan <john.duncan@oracle.com>
    branch nick: 7.2.4-bugs
    timestamp: Tue 2012-03-06 19:57:36 -0800
    message:
      Fix for warnings on linux-release
------------------------------------------------------------
revno: 3831 [merge]
committer: John David Duncan <john.duncan@oracle.com>
branch nick: mysql-5.5-cluster-7.2
timestamp: Tue 2012-03-06 17:51:06 -0800
message:
  Merge local 7.2.4-bugs tree into local master
    ------------------------------------------------------------
    revno: 3818.1.6
    committer: John David Duncan <john.duncan@oracle.com>
    branch nick: 7.2.4-bugs
    timestamp: Tue 2012-03-06 17:22:53 -0800
    message:
      Fix for MySQL bug#64566 - freelist depletion.
      Some naming conventions are revised -- "io_complete" refers only to 
      the memcache connection; "release" is now used to refer to the resources 
      used by the internal NDB operation (such as the NdbInstance that was not 
      being returned to its freelist).  Calls into the scheduler from C 
      code are also now prefixed with scheduler_ rather than pipeline_.    
      Some new documentation in ndb_engine.c better describes the API calls 
      from memcached into the engine.
    ------------------------------------------------------------
    revno: 3818.1.5
    committer: John David Duncan <john.duncan@oracle.com>
    branch nick: 7.2.4-bugs
    timestamp: Tue 2012-03-06 16:38:08 -0800
    message:
      Fix memory leaks in Config_v1.
    ------------------------------------------------------------
    revno: 3818.1.4
    committer: John David Duncan <john.duncan@oracle.com>
    branch nick: 7.2.4-bugs
    timestamp: Mon 2012-03-05 09:51:21 -0800
    message:
      Start of an effort to rationalize the life cycle of NdbInstance.
    ------------------------------------------------------------
    revno: 3818.1.3
    committer: John David Duncan <john.duncan@oracle.com>
    branch nick: 7.2.4-bugs
    timestamp: Fri 2012-03-02 20:28:09 -0800
    message:
        New uniform treatment of engine-internal errors and NDBAPI errors.
    ------------------------------------------------------------
    revno: 3818.1.2
    committer: John David Duncan <john.duncan@oracle.com>
    branch nick: 7.2.4-bugs
    timestamp: Fri 2012-03-02 18:14:40 -0800
    message:
      New "stats errors" command shows counter for each NDB error code.
------------------------------------------------------------
revno: 3830 [merge]
committer: jonas oreland <jonas.oreland@oracle.com>
branch nick: cluster-7.2
timestamp: Tue 2012-03-06 08:58:33 +0100
message:
  ndb - merge 71 to 72
    ------------------------------------------------------------
    revno: 2555.698.239
    committer: Craig L Russell <Craig.Russell@oracle.com>
    branch nick: mysql-5.1-telco-7.1
    timestamp: Mon 2012-03-05 18:25:21 -0800
    message:
      Disaable smart NdbRecord for clusterj
    ------------------------------------------------------------
    revno: 2555.698.238
    committer: Craig L Russell <Craig.Russell@oracle.com>
    branch nick: mysql-5.1-telco-7.1
    timestamp: Mon 2012-03-05 16:46:42 -0800
    message:
      Clean up test tables after clusterj.test
    ------------------------------------------------------------
    revno: 2555.698.237
    committer: Craig L Russell <Craig.Russell@oracle.com>
    branch nick: mysql-5.1-telco-7.1
    timestamp: Mon 2012-03-05 14:28:15 -0800
    message:
      Use NdbRecord-formatted data buffer to store values for domain model
      Both the original Object[ ] implementation and the NdbRecord implementation
        are available, statically configured via a -D option or system environment
      Improve error reporting for tests
      NdbRecord domain model is implemented for insert, delete, update, and write
      Optimized use of NdbRecord domain model for find, query, load is not yet implemented
------------------------------------------------------------
revno: 3829 [merge]
committer: magnus.blaudd@oracle.com
branch nick: 7.2
timestamp: Mon 2012-03-05 14:04:02 +0100
message:
  Merge 7.1 -> 7.2
    ------------------------------------------------------------
    revno: 2555.698.236 [merge]
    committer: magnus.blaudd@oracle.com
    branch nick: 7.1
    timestamp: Mon 2012-03-05 14:02:16 +0100
    message:
      Merge 7.0 -> 7.1
        ------------------------------------------------------------
        revno: 2555.732.9
        committer: magnus.blaudd@oracle.com
        branch nick: 7.0
        timestamp: Mon 2012-03-05 13:53:12 +0100
        message:
          ndb
           - remove dependency on function from mysys/sha1.h since they no longer exist
             in the future. Instead use our "standard" md5 function to create
             a human readable digest which pgman may print to the
             log file in debug compile.
           - remove two unecessary include of md5_hash.hpp  
------------------------------------------------------------
revno: 3828 [merge]
committer: magnus.blaudd@oracle.com
branch nick: 7.2
timestamp: Mon 2012-03-05 13:51:16 +0100
message:
  Merge 7.1 -> 7.2
    ------------------------------------------------------------
    revno: 2555.698.235 [merge]
    committer: magnus.blaudd@oracle.com
    branch nick: 7.1
    timestamp: Mon 2012-03-05 13:49:33 +0100
    message:
      Merge 7.0 -> 7.1
        ------------------------------------------------------------
        revno: 2555.732.8 [merge]
        committer: magnus.blaudd@oracle.com
        branch nick: 7.0
        timestamp: Mon 2012-03-05 13:29:10 +0100
        message:
          Merge in fix for bug#13428853
            ------------------------------------------------------------
            revno: 2555.733.1
            committer: magnus.blaudd@oracle.com
            branch nick: 7.0
            timestamp: Mon 2012-03-05 11:17:53 +0100
            message:
              Bug #13428853	DONT CHECK/CREATE CONFIG-DIR WHEN SKIP-CONFIG-CACHE IS USED
               - Skip check and create of config dir if no config cache is being used
               - Add test case
------------------------------------------------------------
revno: 3827 [merge]
committer: Jonas Oreland <jonas.oreland@oracle.com>
branch nick: cluster-7.2
timestamp: Mon 2012-03-05 10:38:49 +0100
message:
  ndb - merge 70-spj-spj into 7.2 (improved out-of-memory handling incl. error insert test-cases)
    ------------------------------------------------------------
    revno: 2555.678.713
    committer: Maitrayi Sabaratnam <maitrayi.sabaratnam@oracle.com>
    branch nick: mysql-5.1-telco-7.0-spj-scan-scan-fault-inject
    timestamp: Thu 2012-03-01 16:13:54 +0100
    message:
      SPJ: failure handling and testing with fault injection
    ------------------------------------------------------------
    revno: 2555.678.712
    committer: Ole John Aske <ole.john.aske@oracle.com>
    branch nick: mysql-5.1-telco-7.0-spj-scan-scan
    timestamp: Tue 2012-02-28 11:48:02 +0100
    message:
      SPJ: Extend HugoQueryBuilder to also create linkedValues referring 'grandparent' columns.
      
      Needed in order to improve testcoverage of SPJ block when doing ERROR_INSERT's
------------------------------------------------------------
revno: 3826 [merge]
committer: jonas oreland <jonas.oreland@oracle.com>
branch nick: cluster-7.2
timestamp: Thu 2012-02-23 16:41:31 +0100
message:
  ndb - merge spj error handling to 7.2
    ------------------------------------------------------------
    revno: 2555.678.711
    committer: Ole John Aske <ole.john.aske@oracle.com>
    branch nick: mysql-5.1-telco-7.0-spj-scan-scan
    timestamp: Wed 2012-02-22 15:53:20 +0100
    message:
      Refactored some of the existing ERROR_INSERT's such that:
      
        - They don't leave object in unintialize / unconstructed state (17001,17002)
        - Follow the same code path as the error condition they simulate.
        - In case of similating 'out-of-some-memory' they actually exit *before*
          that object was created such that pointers referring that object are NULL/RNIL.
      
      Added some more jam() to trace ERROR_INSERTs in jam-log.
    ------------------------------------------------------------
    revno: 2555.678.710
    committer: Ole John Aske <ole.john.aske@oracle.com>
    branch nick: mysql-5.1-telco-7.0-spj-scan-scan
    timestamp: Wed 2012-02-22 15:35:51 +0100
    message:
      Fixed build break in previous commit.
    ------------------------------------------------------------
    revno: 2555.678.709
    committer: Ole John Aske <ole.john.aske@oracle.com>
    branch nick: mysql-5.1-telco-7.0-spj-scan-scan
    timestamp: Wed 2012-02-22 15:03:58 +0100
    message:
      Fix for handling (partially) failed SPJ queries:
      
      Inspired by Maitrayis error injection, testing and patches it has
      become clear that:
      
        - We have to distinquish between 'soft' and 'hard' errors
          in our error handling.
      
        - 'Soft' errors (like 'row not found') should be signaled to
           API, but execution is allowed to continue.
      
        - 'Hard' errors should cause execution to ::abort(), and the Request
           entering ABORTING state.
      
        - When in ABORTING state, no further TreeNode execution should
          be started.
      
        - API should give up 'outstanding' counting when a hard error is
          received. Further signals will not be expected, if any arrives
          they should be silently ignored.
      
       These issues are addressed in this patch.
      
       Added the following error injection test cases:
        - Set invalid table version in LQHKEYREQ such that rewritten
          execLQHKEYREF is now tested.
       
        - Simulate that ::lookup_send() determines the destination 
          LQH-node to not being 'alive', and thus immediately
          returns NodeFailure (error 20016)
      
        - Simulate 'OutOfQueryMemory' in lookup_parent_row(). 
    ------------------------------------------------------------
    revno: 2555.678.708 [merge]
    committer: Ole John Aske <ole.john.aske@oracle.com>
    branch nick: mysql-5.1-telco-7.0-spj-scan-scan
    timestamp: Wed 2012-02-22 14:19:55 +0100
    message:
      Merge from mysql-5.1-telco-7.0 into spj-SS branch
    ------------------------------------------------------------
    revno: 2555.678.707
    committer: Maitrayi Sabaratnam <maitrayi.sabaratnam@oracle.com>
    branch nick: mysql-5.1-telco-7.0-spj-scan-scan-spj-fi
    timestamp: Tue 2011-12-13 13:20:00 +0100
    message:
      Adding fault injection to Spj
    ------------------------------------------------------------
    revno: 2555.678.706
    committer: Jan Wedvik <jan.wedvik@oracle.com>
    branch nick: show-status
    timestamp: Thu 2011-11-24 11:17:09 +0100
    message:
      This commit rewrites the ndb_join_pushdown test into using information_schema.global_status
      rather than 'show status ....' for reading variables like Ndb_pushed_queries_defined. 
      This simplifies the test code.
------------------------------------------------------------
revno: 3825
committer: jonas oreland <jonas.oreland@oracle.com>
branch nick: cluster-7.2
timestamp: Thu 2012-02-23 14:55:39 +0100
message:
  ndb - install missing conf file
------------------------------------------------------------
revno: 3824
committer: Jonas Oreland <jonas.oreland@oracle.com>
branch nick: cluster-7.2
timestamp: Wed 2012-02-22 11:09:58 +0100
message:
  ndb - fix club compiler warning
------------------------------------------------------------
revno: 3823 [merge]
committer: John David Duncan <john.duncan@oracle.com>
branch nick: mysql-5.5-cluster-7.2
timestamp: Tue 2012-02-21 16:23:50 -0800
message:
  Merge from 7.2.4-bugs
    ------------------------------------------------------------
    revno: 3818.1.1
    committer: John David Duncan <john.duncan@oracle.com>
    branch nick: 7.2.4-bugs
    timestamp: Tue 2012-02-21 16:19:45 -0800
    message:
      Fix for bug#13567414 -- memcached segfaults if "ndbmemcache" config database does not exist.
------------------------------------------------------------
revno: 3822 [merge]
committer: jonas oreland <jonas.oreland@oracle.com>
branch nick: cluster-7.2
timestamp: Tue 2012-02-21 09:30:58 +0100
message:
  ndb - merge 71 to 72
    ------------------------------------------------------------
    revno: 2555.698.234 [merge]
    committer: jonas oreland <jonas.oreland@oracle.com>
    branch nick: telco-7.1
    timestamp: Tue 2012-02-21 09:29:15 +0100
    message:
      ndb - merge 70 to 71
        ------------------------------------------------------------
        revno: 2555.732.7
        committer: jonas oreland <jonas.oreland@oracle.com>
        branch nick: telco-7.0
        timestamp: Tue 2012-02-21 09:27:55 +0100
        message:
          ndb - run upgrade tests with ndbmtd, set SE to myisam, as 5.5 otherwise chokes on skip-innodb
------------------------------------------------------------
revno: 3821 [merge]
committer: Jonas Oreland <jonas.oreland@oracle.com>
branch nick: cluster-7.2
timestamp: Mon 2012-02-20 22:15:00 +0100
message:
  ndb - merge 71 to 72
    ------------------------------------------------------------
    revno: 2555.698.233 [merge]
    committer: Jonas Oreland <jonas.oreland@oracle.com>
    branch nick: telco-7.1
    timestamp: Mon 2012-02-20 22:10:05 +0100
    message:
      ndb - merge 70 to 71
        ------------------------------------------------------------
        revno: 2555.732.6
        committer: Jonas Oreland <jonas.oreland@oracle.com>
        branch nick: telco-7.0
        timestamp: Mon 2012-02-20 22:05:06 +0100
        message:
          ndb - 1) handle changed install path (5.1 vs 5.5) 2) handle 5.5 lack of rpath + changed install path of libs => need to rewrite LD_LIBRARY_PATH during 5.1 => 5.5 upgrade
        ------------------------------------------------------------
        revno: 2555.732.5
        committer: Jonas Oreland <jonas.oreland@oracle.com>
        branch nick: telco-7.0
        timestamp: Mon 2012-02-20 22:01:57 +0100
        message:
          ndb - add start-index to BaseString::indexOf() - unfortunatly needed to make atrt handle 5.1 to 5.5 upgrade
------------------------------------------------------------
revno: 3820
committer: Jonas Oreland <jonas.oreland@oracle.com>
branch nick: cluster-7.2
timestamp: Mon 2012-02-20 22:11:31 +0100
message:
  ndb - fix upgrade problem with change of MAX_NDBMT_LQH_WORKERS
------------------------------------------------------------
revno: 3819
committer: Jonas Oreland <jonas.oreland@oracle.com>
branch nick: cluster-7.2
timestamp: Mon 2012-02-20 22:10:49 +0100
message:
  ndb - add missing test prg to 5.5
------------------------------------------------------------
revno: 3818 [merge]
committer: Jonas Oreland <jonas.oreland@oracle.com>
branch nick: cluster-7.2
timestamp: Mon 2012-02-20 10:14:06 +0100
message:
  ndb - merge 71 to 72
    ------------------------------------------------------------
    revno: 2555.698.232 [merge]
    committer: Jonas Oreland <jonas.oreland@oracle.com>
    branch nick: telco-7.1
    timestamp: Mon 2012-02-20 10:13:16 +0100
    message:
      ndb - merge 70 to 71
        ------------------------------------------------------------
        revno: 2555.732.4
        committer: Jonas Oreland <jonas.oreland@oracle.com>
        branch nick: telco-7.0
        timestamp: Mon 2012-02-20 10:03:01 +0100
        message:
          ndb - bug-13618181 - bug in latest patch, cause random and rare signal 11
    ------------------------------------------------------------
    revno: 2555.698.231 [merge]
    committer: Jonas Oreland <jonas.oreland@oracle.com>
    branch nick: telco-7.1
    timestamp: Fri 2012-02-17 14:41:44 +0100
    message:
      ndb - merge 70 to 71
        ------------------------------------------------------------
        revno: 2555.732.3
        committer: Jonas Oreland <jonas.oreland@oracle.com>
        branch nick: telco-7.0
        timestamp: Fri 2012-02-17 14:41:01 +0100
        message:
          ndb - fix atrt wrt upgrade from 5.1 to 5.5, since the friendly binaries changed places...
------------------------------------------------------------
revno: 3817 [merge]
committer: Martin Skold <Martin.Skold@oracle.com>
branch nick: mysql-5.5-cluster-7.2
timestamp: Fri 2012-02-17 11:27:55 +0100
message:
  Merge from 7.1
    ------------------------------------------------------------
    revno: 2555.698.230 [merge]
    committer: Martin Skold <Martin.Skold@oracle.com>
    branch nick: mysql-5.1-telco-7.1
    timestamp: Fri 2012-02-17 10:38:57 +0100
    message:
      Merge
        ------------------------------------------------------------
        revno: 2555.732.2 [merge]
        committer: Martin Skold <Martin.Skold@oracle.com>
        branch nick: mysql-5.1-telco-7.0
        timestamp: Fri 2012-02-17 09:53:24 +0100
        message:
          Merge
        ------------------------------------------------------------
        revno: 2555.732.1
        committer: Martin Skold <Martin.Skold@oracle.com>
        branch nick: mysql-5.1-telco-7.0
        timestamp: Fri 2012-02-17 09:03:56 +0100
        message:
          Bug#11753491  44940: MYSQLD CRASHES WHEN CREATING A CLUSTER TABLE WITH 64 CHARACTER TABLE NAME: Added checks if table name exceeds 63 characters
    ------------------------------------------------------------
    revno: 2555.698.229 [merge]
    committer: Jonas Oreland <jonas.oreland@oracle.com>
    branch nick: telco-7.1
    timestamp: Fri 2012-02-17 09:36:16 +0100
    message:
      ndb - merge 70 to 71
------------------------------------------------------------
revno: 3816 [merge]
committer: Jonas Oreland <jonas.oreland@oracle.com>
branch nick: cluster-7.2
timestamp: Fri 2012-02-17 09:37:19 +0100
message:
  ndb - merge 71 to 72
    ------------------------------------------------------------
    revno: 2555.725.93
    committer: Jonas Oreland <jonas.oreland@oracle.com>
    branch nick: telco-7.0
    timestamp: Fri 2012-02-17 09:18:43 +0100
    message:
      ndb - bug#13618181 - the last patch - prefill thread-local send-buffer-pool before starting to execute signals
------------------------------------------------------------
revno: 3815 [merge]
committer: jonas oreland <jonas.oreland@oracle.com>
branch nick: cluster-7.2
timestamp: Thu 2012-02-16 18:11:21 +0100
message:
  ndb - merge 71 to 72
    ------------------------------------------------------------
    revno: 2555.698.228 [merge]
    committer: jonas oreland <jonas.oreland@oracle.com>
    branch nick: telco-7.1
    timestamp: Thu 2012-02-16 18:07:59 +0100
    message:
      ndb - merge 70 to 71
        ------------------------------------------------------------
        revno: 2555.725.92
        committer: Jonas Oreland <jonas.oreland@oracle.com>
        branch nick: telco-7.0
        timestamp: Thu 2012-02-16 17:50:50 +0100
        message:
          ndb - bug#13618181 - patch 3 - pack send buffers also when getting full fifo for a particular node (from a particular thread)
------------------------------------------------------------
revno: 3814 [merge]
committer: jonas oreland <jonas.oreland@oracle.com>
branch nick: cluster-7.2
timestamp: Tue 2012-02-14 10:16:57 +0100
message:
  ndb - merge 71 to 72
    ------------------------------------------------------------
    revno: 2555.698.227 [merge]
    committer: jonas oreland <jonas.oreland@oracle.com>
    branch nick: telco-7.1
    timestamp: Tue 2012-02-14 09:30:05 +0100
    message:
      ndb - merge 70 to 71
        ------------------------------------------------------------
        revno: 2555.725.91
        author: mikael.ronstrom@oracle.com
        committer: jonas oreland <jonas.oreland@oracle.com>
        branch nick: telco-7.0
        timestamp: Tue 2012-02-14 09:16:48 +0100
        message:
          ndb - fix for flexAsynch
------------------------------------------------------------
revno: 3813
committer: jonas oreland <jonas.oreland@oracle.com>
branch nick: cluster-7.2
timestamp: Tue 2012-02-14 10:15:10 +0100
message:
  ndb - fix merge error 2 (file not added to CMakeList.txt) wonder why it still seem to work on most platforms...
------------------------------------------------------------
revno: 3812
committer: jonas oreland <jonas.oreland@oracle.com>
branch nick: cluster-7.2
timestamp: Tue 2012-02-14 10:06:57 +0100
message:
  ndb - fix subtle merge error
------------------------------------------------------------
revno: 3811 [merge]
committer: jonas oreland <jonas.oreland@oracle.com>
branch nick: cluster-7.2
timestamp: Tue 2012-02-14 09:00:53 +0100
message:
  ndb - merge 5.5.20 into 7.2
    ------------------------------------------------------------
    revno: 3069.157.12
    tags: mysql-5.5.20, clone-5.5.20-build
    committer: Sergey Vojtovich <sergey.vojtovich@oracle.com>
    branch nick: mysql-5.5-security-push
    timestamp: Fri 2011-12-16 12:17:13 +0400
    message:
      Test case for BUG11763712 is intended for 5.1 only.
