------------------------------------------------------------
revno: 4266 [merge]
tags: clone-mysql-5.1.56-ndb-7.1.15-src-build
committer: Jonas Oreland <jonas.oreland@oracle.com>
branch nick: telco-7.1
timestamp: Wed 2011-06-29 10:16:32 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.141.15 [merge]
    committer: Jonas Oreland <jonas.oreland@oracle.com>
    branch nick: telco-7.0
    timestamp: Wed 2011-06-29 10:14:18 +0200
    message:
      ndb - merge 63 to 70
        ------------------------------------------------------------
        revno: 2585.180.58
        committer: Jonas Oreland <jonas.oreland@oracle.com>
        branch nick: telco-6.3
        timestamp: Wed 2011-06-29 10:10:49 +0200
        message:
          ndb - bump version to 6.3.46
    ------------------------------------------------------------
    revno: 3362.141.14
    committer: Jonas Oreland <jonas.oreland@oracle.com>
    branch nick: telco-7.0
    timestamp: Wed 2011-06-29 10:11:29 +0200
    message:
      ndb - bump version to 7.0.27
    ------------------------------------------------------------
    revno: 3362.141.13
    tags: clone-mysql-5.1.56-ndb-7.0.26-src-build
    committer: Jonas Oreland <jonas.oreland@oracle.com>
    branch nick: telco-7.0
    timestamp: Wed 2011-06-29 09:56:14 +0200
    message:
      ndb - fix another ordered on initialization warning
    ------------------------------------------------------------
    revno: 3362.141.12 [merge]
    committer: Jonas Oreland <jonas.oreland@oracle.com>
    branch nick: telco-7.0
    timestamp: Wed 2011-06-29 09:47:26 +0200
    message:
      ndb - merge 63 to 70
        ------------------------------------------------------------
        revno: 2585.180.57
        tags: clone-mysql-5.1.56-ndb-6.3.45-src-build
        committer: Jonas Oreland <jonas.oreland@oracle.com>
        branch nick: telco-6.3
        timestamp: Wed 2011-06-29 09:45:09 +0200
        message:
          ndb - bug#61684 - align dict/suma wrt to MaxNoOfTables (aka introduce bug#47793 in suma)
        ------------------------------------------------------------
        revno: 2585.180.56
        committer: Jonas Oreland <jonas.oreland@oracle.com>
        branch nick: telco-6.3
        timestamp: Tue 2011-06-28 13:34:30 +0200
        message:
          ndb - fix ctype_cp932_binlog_stm also in 6.3
------------------------------------------------------------
revno: 4265 [merge]
committer: jonas oreland <jonas.oreland@oracle.com>
branch nick: telco-7.1
timestamp: Tue 2011-06-28 18:19:57 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.141.11
    committer: jonas oreland <jonas.oreland@oracle.com>
    branch nick: telco-7.0
    timestamp: Tue 2011-06-28 18:13:49 +0200
    message:
      ndb - use UintPtr in NdbIndexStat (instead of size_t), public api
    ------------------------------------------------------------
    revno: 3362.141.10
    committer: Jonas Oreland <jonas.oreland@oracle.com>
    branch nick: telco-7.0
    timestamp: Tue 2011-06-28 11:33:33 +0200
    message:
      ndb - fix compiler warning
------------------------------------------------------------
revno: 4264 [merge]
committer: Jonas Oreland <jonas.oreland@oracle.com>
branch nick: telco-7.1
timestamp: Tue 2011-06-28 10:57:41 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.141.9 [merge]
    committer: Jonas Oreland <jonas.oreland@oracle.com>
    branch nick: telco-7.0
    timestamp: Tue 2011-06-28 10:47:18 +0200
    message:
      ndb - merge 63 to 70
        ------------------------------------------------------------
        revno: 2585.180.55
        committer: Jonas Oreland <jonas.oreland@oracle.com>
        branch nick: telco-6.3
        timestamp: Tue 2011-06-28 10:40:56 +0200
        message:
          ndb - bug#12646659 - don't refresh closed scans
------------------------------------------------------------
revno: 4263
committer: magnus.blaudd@oracle.com
branch nick: 7.1
timestamp: Mon 2011-06-27 17:07:36 +0200
message:
  ndb
   - properly escape the semicolon(which is cmakes list
     separator) when building the classpath
   - use quotes when concatenating the classpath_str variable
------------------------------------------------------------
revno: 4262 [merge]
committer: Jonas Oreland <jonas.oreland@oracle.com>
branch nick: telco-7.1
timestamp: Mon 2011-06-27 09:00:44 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.141.8
    committer: Jonas Oreland <jonas.oreland@oracle.com>
    branch nick: telco-7.0
    timestamp: Mon 2011-06-27 08:26:01 +0200
    message:
      ndb - bug#61607 - don't count down nodes as failed in shutdown
    ------------------------------------------------------------
    revno: 3362.141.7
    committer: jonas oreland <jonas.oreland@oracle.com>
    branch nick: telco-7.0
    timestamp: Sat 2011-06-25 17:07:07 +0200
    message:
      ndb - fix compiler warning in ha_ndb_index_stat debug-printout
    ------------------------------------------------------------
    revno: 3362.141.6
    committer: jonas oreland <jonas.oreland@oracle.com>
    branch nick: telco-7.0
    timestamp: Sat 2011-06-25 16:19:31 +0200
    message:
      ndb - fix funcs_s wrt maintained row-estimates patch
    ------------------------------------------------------------
    revno: 3362.141.5
    committer: Jan Wedvik <jan.wedvik@oracle.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Fri 2011-06-24 14:01:37 +0200
    message:
      This is a refactoring, replacing m_frags_not_complete with m_frags_complete to improve readability.
------------------------------------------------------------
revno: 4261
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Fri 2011-06-24 15:48:05 -0700
message:
  Update crund clusterjLoad to new operation names
  fix build for clusterjLoad
------------------------------------------------------------
revno: 4260
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Fri 2011-06-24 13:58:44 -0700
message:
  Support Integer and Long as primary key field types.
  Adapt test cases to support this usage.
------------------------------------------------------------
revno: 4259 [merge]
committer: jonas oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Thu 2011-06-23 15:43:00 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.141.4
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Thu 2011-06-23 14:19:32 +0200
    message:
      ndb - maintained row-estimates
    ------------------------------------------------------------
    revno: 3362.141.3
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2011-06-22 22:01:17 +0200
    message:
      ndb - remove pointless mutex lock/unlock
------------------------------------------------------------
revno: 4258 [merge]
committer: magnus.blaudd@oracle.com
branch nick: 7.1
timestamp: Wed 2011-06-22 11:32:00 +0200
message:
  Merge 7.0 -> 7.1
    ------------------------------------------------------------
    revno: 3362.141.2 [merge]
    committer: magnus.blaudd@oracle.com
    branch nick: mysql-5.1-telco-7.0
    timestamp: Wed 2011-06-22 11:27:33 +0200
    message:
      Merge
        ------------------------------------------------------------
        revno: 3362.121.155
        committer: magnus.blaudd@oracle.com
        branch nick: 7.0
        timestamp: Wed 2011-06-22 10:57:03 +0200
        message:
          ndb
           - fix warning about unused variable
           - use bool as datatype for true/false variable
    ------------------------------------------------------------
    revno: 3362.141.1
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2011-06-22 10:04:19 +0200
    message:
      ndb - bug#12678971 - remove c++ from ndb_logevent.h and friends
------------------------------------------------------------
revno: 4257
committer: magnus.blaudd@oracle.com
branch nick: 7.1
timestamp: Wed 2011-06-22 11:23:35 +0200
message:
  ndb
   - concatenate the ARG_CLASSPATH variable (which holds a list of strings)
     using platform specific separator before passing it to javac
------------------------------------------------------------
revno: 4256
committer: magnus.blaudd@oracle.com
branch nick: 7.1
timestamp: Wed 2011-06-22 11:01:40 +0200
message:
  ndb
   - escape the echo command proerly to avoid executin parts of the
     echoed string
------------------------------------------------------------
revno: 4255 [merge]
committer: magnus.blaudd@oracle.com
branch nick: 7.1
timestamp: Wed 2011-06-22 10:36:40 +0200
message:
  Merge 7.0 -> 7.1
    ------------------------------------------------------------
    revno: 3362.121.154 [merge]
    committer: magnus.blaudd@oracle.com
    branch nick: 7.0
    timestamp: Wed 2011-06-22 10:34:17 +0200
    message:
      Merge
        ------------------------------------------------------------
        revno: 3362.140.5
        committer: magnus.blaudd@oracle.com
        branch nick: 7.0
        timestamp: Wed 2011-06-22 09:57:40 +0200
        message:
          ndb -remove junk comment
        ------------------------------------------------------------
        revno: 3362.140.4
        committer: magnus.blaudd@oracle.com
        branch nick: 7.0
        timestamp: Wed 2011-06-22 09:37:51 +0200
        message:
          nbd
           - use mysql_ prefixed functions when working with mutexes and conds
            declared by MySQL Server
           - move the lock of LOCK_global_server_variables into the accessor
             function and fix mysql_ prefix
        ------------------------------------------------------------
        revno: 3362.140.3
        committer: magnus.blaudd@oracle.com
        branch nick: 7.0
        timestamp: Wed 2011-06-22 09:20:42 +0200
        message:
          ndb
           - remove uneccessary typedef st_ndbcluster_share
           - use NDB_SHARE everywhere
        ------------------------------------------------------------
        revno: 3362.140.2
        committer: magnus.blaudd@oracle.com
        branch nick: 7.0
        timestamp: Wed 2011-06-22 09:12:01 +0200
        message:
          ndb
           - use my_hash_ prefixed version when calling my_hash function,
             the non prefixed functions has been removed in the future.
        ------------------------------------------------------------
        revno: 3362.140.1
        committer: magnus.blaudd@oracle.com
        branch nick: 7.0
        timestamp: Wed 2011-06-22 09:09:52 +0200
        message:
          ndb
           - Add struct to forward declare Ndb_index_stat pointer
    ------------------------------------------------------------
    revno: 3362.121.153
    committer: magnus.blaudd@oracle.com
    branch nick: 7.0
    timestamp: Wed 2011-06-22 08:39:41 +0200
    message:
      ndb
       - remove uncessary forward declaration of NdbInterpretedCode
------------------------------------------------------------
revno: 4254 [merge]
committer: magnus.blaudd@oracle.com
branch nick: 7.1
timestamp: Wed 2011-06-22 08:20:18 +0200
message:
  Merge 7.0 -> 7.1
    ------------------------------------------------------------
    revno: 3362.121.152
    committer: magnus.blaudd@oracle.com
    branch nick: 7.0
    timestamp: Wed 2011-06-22 08:19:13 +0200
    message:
      ndb
       - use ADD_CONVENIENCE_LIBRARY when bulding libraies which should be
         merged into libndbclient(also libportlib)
------------------------------------------------------------
revno: 4253 [merge]
committer: magnus.blaudd@oracle.com
branch nick: 7.1
timestamp: Tue 2011-06-21 17:08:34 +0200
message:
  Merge 7.0 -> 7.1
    ------------------------------------------------------------
    revno: 3362.121.151
    committer: magnus.blaudd@oracle.com
    branch nick: 7.0
    timestamp: Tue 2011-06-21 17:03:03 +0200
    message:
      ndb
       - fix suppression in ctype_cp932_binlog_stm.test which is
         date dependent(causes the binlog positions to change). Since it's
         midsummer today, the binlog size/position has grown with one. Enjoy!
    ------------------------------------------------------------
    revno: 3362.121.150 [merge]
    committer: magnus.blaudd@oracle.com
    branch nick: mysql-5.1-telco-7.0
    timestamp: Tue 2011-06-21 16:12:16 +0200
    message:
      Merge
------------------------------------------------------------
revno: 4252 [merge]
committer: magnus.blaudd@oracle.com
branch nick: mysql-5.1-telco-7.1
timestamp: Tue 2011-06-21 16:12:56 +0200
message:
  Merge
    ------------------------------------------------------------
    revno: 4243.1.4 [merge]
    committer: magnus.blaudd@oracle.com
    branch nick: 7.1
    timestamp: Tue 2011-06-21 16:09:17 +0200
    message:
      Merge 7.0 -> 7.1
        ------------------------------------------------------------
        revno: 3362.138.5 [merge]
        committer: magnus.blaudd@oracle.com
        branch nick: 7.0
        timestamp: Tue 2011-06-21 16:07:12 +0200
        message:
          Merge
            ------------------------------------------------------------
            revno: 3362.139.3
            committer: Magnus Bl?udd <magnus.blaudd@sun.com>
            branch nick: 7.0
            timestamp: Mon 2011-06-20 10:31:14 +0200
            message:
              ndb
               - rename the lib built in mgmcommon to ndbmgmcommon instead of ndbmgmsrv
            ------------------------------------------------------------
            revno: 3362.139.2
            committer: Magnus Bl?udd <magnus.blaudd@sun.com>
            branch nick: 7.0
            timestamp: Mon 2011-06-20 09:17:57 +0200
            message:
              ndb
               - Prefix all values in OpTypes enum  with OP_ to avoid nameclash(with for example DELETE)
            ------------------------------------------------------------
            revno: 3362.139.1
            committer: Magnus Bl?udd <magnus.blaudd@sun.com>
            branch nick: 7.0
            timestamp: Mon 2011-06-13 14:43:50 +0200
            message:
              ndb
               - remove unused include of DbinfoScan.hpp
        ------------------------------------------------------------
        revno: 3362.138.4
        committer: magnus.blaudd@oracle.com
        branch nick: 7.0
        timestamp: Tue 2011-06-21 16:05:31 +0200
        message:
          ndb
           - set ndbtrace to link/depend on ndbsignaldata
    ------------------------------------------------------------
    revno: 4243.1.3
    committer: magnus.blaudd@oracle.com
    branch nick: 7.1
    timestamp: Tue 2011-06-21 16:04:38 +0200
    message:
      ndb
             - use ADD_CONVENIENCE_LIBRARY when bulding libraies which should be
               merged into libndbclient
    ------------------------------------------------------------
    revno: 4243.1.2 [merge]
    committer: magnus.blaudd@oracle.com
    branch nick: 7.1
    timestamp: Tue 2011-06-21 16:01:55 +0200
    message:
      Merge 7.0 -> 7.1
        ------------------------------------------------------------
        revno: 3362.138.3
        committer: magnus.blaudd@oracle.com
        branch nick: 7.0
        timestamp: Tue 2011-06-21 15:58:00 +0200
        message:
          ndb
           - use ADD_CONVENIENCE_LIBRARY when bulding libraies which should be
             merged into libndbclient
        ------------------------------------------------------------
        revno: 3362.138.2
        committer: magnus.blaudd@oracle.com
        branch nick: 7.0
        timestamp: Thu 2011-06-16 11:32:30 +0200
        message:
          ndb
             - fix compiler warnings about unused calculated value
        ------------------------------------------------------------
        revno: 3362.138.1
        committer: magnus.blaudd@oracle.com
        branch nick: 7.0
        timestamp: Wed 2011-06-15 15:24:40 +0200
        message:
          ndb
           - fix warning about unused variable by using it also when ! defined ERROR_INSERT
    ------------------------------------------------------------
    revno: 4243.1.1
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.1
    timestamp: Thu 2011-06-16 11:33:27 +0200
    message:
      ndb
       - fix problem with compiling 7.1 on machine without Java
------------------------------------------------------------
revno: 4251 [merge]
committer: magnus.blaudd@oracle.com
branch nick: 7.1
timestamp: Tue 2011-06-21 15:50:33 +0200
message:
  Merge 7.0 -> 7.1
    ------------------------------------------------------------
    revno: 3362.121.149
    committer: magnus.blaudd@oracle.com
    branch nick: 7.0-bug12352191
    timestamp: Tue 2011-06-21 15:10:37 +0200
    message:
      Bug#12352191 NDB_MGMD NODES DON'T SEE EACH OTHER AS CONNECTED UNTIL END OF
      SYSTEM RESTART.
       - Add specialized function status_mgmd() and status_api() used to
         retrive version and status for API and MGM nodes.
       - Make status_mgmd() aware that other MGM nodes are connected directly
         to own node with transporter
       - Fix missing assignment of mysql_version in Qmgr
       - Return the connected adress from transporter also for MGM nodes
       - Also fix bug#48301 by adding a new status CONNECTED to be used
         when we know the node is connected(this stats was previously only
         indicated by version != 0)
    ------------------------------------------------------------
    revno: 3362.121.148
    committer: Ole John Aske <ole.john.aske@oracle.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Mon 2011-06-20 15:25:48 +0200
    message:
      SPJ API change: Relax lifetime dependencies between 'NdbQueryDef' and its instantiated NdbQuery objects.
      
      The application is now allowed to destruct the NdbQueryDef after all its instantiated 
      NdbQuery objects has been '::close()'ed.
    ------------------------------------------------------------
    revno: 3362.121.147
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Mon 2011-06-20 14:34:27 +0200
    message:
      ndb - fix bug where row-count could be reported incorrectly
        if in transaction performing delete of non-existing record using a primary/unique key
        and then selecting count(*)
------------------------------------------------------------
revno: 4250
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Mon 2011-06-20 16:47:37 -0700
message:
  Modify some error conditions to print mismatches instead of failing immediately
  Allow data comparison failures to continue or throw an exception
  Normalize operation names (remove "_" from names except at end)
  Clean rows only at the beginning (operations already delete rows during tests)
------------------------------------------------------------
revno: 4249
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Mon 2011-06-20 16:34:36 -0700
message:
  Refactor QueryExecutionContext to accommodate implementation for clusterjdbc
  Add functionality required by crund for bulk operations:
  - Implement typed access of query parameters for batched queries
  - Implement batch delete
------------------------------------------------------------
revno: 4248 [merge]
committer: Frazer Clement <frazer.clement@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Mon 2011-06-20 17:22:38 +0100
message:
  Merge 7.0->7.1
    ------------------------------------------------------------
    revno: 3362.121.146
    committer: Frazer Clement <frazer.clement@oracle.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Fri 2011-06-17 18:20:22 +0100
    message:
      WL5353 Primary Cluster Conflict Resolution
        Fix bug in refactoring patch - violation count is now 64bit.
    ------------------------------------------------------------
    revno: 3362.121.145
    committer: Martin Skold <Martin.Skold@oracle.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Fri 2011-06-17 12:15:34 +0200
    message:
      Moved multi server tests to new test case, ndb_alter_table_online_multi
    ------------------------------------------------------------
    revno: 3362.121.144
    committer: Martin Skold <Martin.Skold@oracle.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Fri 2011-06-17 12:15:04 +0200
    message:
      Bug#7798 Running range scan after alter table in different thread causes node failure: Fixed test case and moved it to ndb_multi
    ------------------------------------------------------------
    revno: 3362.121.143
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Fri 2011-06-17 11:13:52 +0200
    message:
      ndb - make sure we never return estimates < 2
------------------------------------------------------------
revno: 4247 [merge]
committer: jonas oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Fri 2011-06-17 09:14:20 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.121.142 [merge]
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Fri 2011-06-17 08:59:47 +0200
    message:
      ndb - merge wl4124 handler part
        ------------------------------------------------------------
        revno: 3362.133.54 [merge]
        committer: Pekka Nousiainen <pekka.nousiainen@oracle.com>
        branch nick: ms-wl4124-70
        timestamp: Thu 2011-06-16 21:16:01 +0300
        message:
          merge main to wl4124-new1
        ------------------------------------------------------------
        revno: 3362.133.53
        committer: Pekka Nousiainen <pekka.nousiainen@oracle.com>
        branch nick: ms-wl4124-70
        timestamp: Thu 2011-06-16 14:36:45 +0300
        message:
          wl#4124 x10_fix.diff
          build fixes
        ------------------------------------------------------------
        revno: 3362.133.52
        committer: Pekka Nousiainen <pekka.nousiainen@oracle.com>
        branch nick: ms-wl4124-70
        timestamp: Wed 2011-06-15 21:07:15 +0300
        message:
          wl#4124 x09_fix.diff
          build fixes
        ------------------------------------------------------------
        revno: 3362.133.51
        committer: Pekka Nousiainen <pekka.nousiainen@oracle.com>
        branch nick: ms-wl4124-70
        timestamp: Wed 2011-06-15 15:51:00 +0300
        message:
          wl#4124 x08_fix.diff
          build fixes
        ------------------------------------------------------------
        revno: 3362.133.50
        committer: Pekka Nousiainen <pekka.nousiainen@oracle.com>
        branch nick: ms-wl4124-70
        timestamp: Wed 2011-06-15 13:37:56 +0300
        message:
          wl#4124 b06_handler.diff
          handler (+ start on modularize), simple MTR fixes
        ------------------------------------------------------------
        revno: 3362.133.49
        committer: Pekka Nousiainen <pekka.nousiainen@oracle.com>
        branch nick: ms-wl4124-70
        timestamp: Wed 2011-06-15 12:15:33 +0300
        message:
          treename wl4124-new1
        ------------------------------------------------------------
        revno: 3362.133.48
        committer: Pekka Nousiainen <pekka.nousiainen@oracle.com>
        branch nick: ms-wl4124-70
        timestamp: Tue 2011-06-14 13:42:04 +0300
        message:
          wl#4124 x07_fix.diff
          build fixes
        ------------------------------------------------------------
        revno: 3362.133.47
        committer: Pekka Nousiainen <pekka.nousiainen@oracle.com>
        branch nick: ms-wl4124-70
        timestamp: Sun 2011-06-12 19:54:32 +0300
        message:
          wl#4124 d05_systab.diff
          change to mysql names and add FRM
        ------------------------------------------------------------
        revno: 3362.133.46
        committer: Pekka Nousiainen <pekka.nousiainen@oracle.com>
        branch nick: ms-wl4124-70
        timestamp: Sun 2011-06-12 19:51:59 +0300
        message:
          wl#4124 d04_systab.diff
          use schema trans for create and drop
        ------------------------------------------------------------
        revno: 3362.133.45 [merge]
        committer: jonas oreland <jonas@mysql.com>
        branch nick: mysql-5.1-telco-7.0-wl4124-new0
        timestamp: Tue 2011-06-07 13:44:29 +0200
        message:
          ndb - merge 70 into wl4124-new0
------------------------------------------------------------
revno: 4246 [merge]
committer: Frazer Clement <frazer.clement@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Thu 2011-06-16 15:39:44 +0100
message:
  Merge 7.0->7.1
    ------------------------------------------------------------
    revno: 3362.121.141
    committer: Frazer Clement <frazer.clement@oracle.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Thu 2011-06-16 15:34:56 +0100
    message:
      WL5353 Primary Cluster Conflict Resolution
        Refactoring existing conflict detection
      
       - Make each existing conflict function use its own counter
       - Allow any existing conflict function to have an exceptions table
       - Consolidate slave state in Ndb handler
       - Refactor conflict detection to reduce impact on 'normal' handler paths
       - Refactor ndb_replication table read to provide information to CREATE TABLE
------------------------------------------------------------
revno: 4245 [merge]
committer: Frazer Clement <frazer.clement@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Thu 2011-06-16 15:36:58 +0100
message:
  Merge 7.0->7.1
    ------------------------------------------------------------
    revno: 3362.121.140 [merge]
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Thu 2011-06-16 15:19:31 +0200
    message:
      ndb - merge 63 to 70
        ------------------------------------------------------------
        revno: 2585.180.54
        committer: Jonas Oreland <jonas@mysql.com>
        branch nick: telco-6.3
        timestamp: Thu 2011-06-16 14:40:11 +0200
        message:
          ndb - Make sure that INCIDENT_LOST_EVENTS is only emitted once, if setting up binlog (after binlog restart) fails.
------------------------------------------------------------
revno: 4244 [merge]
committer: Frazer Clement <frazer.clement@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Thu 2011-06-16 13:44:06 +0100
message:
  Merge 7.0->7.1
    ------------------------------------------------------------
    revno: 3362.121.139
    committer: Frazer Clement <frazer.clement@oracle.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Thu 2011-06-16 13:36:28 +0100
    message:
      Modify 2 channel circular replication testcase to use IGNORE_SERVER_IDS
      
      The 2 channel circular replication testcase uses the same server id for
      both MySQLDs on each site to avoid double application of 'reflected' events.
      
      This is not necessary with the IGNORE_SERVER_IDs CHANGE MASTER option, so
      the testcase is modified to use distinct server ids + IGNORE_SERVER_IDS.
    ------------------------------------------------------------
    revno: 3362.121.138
    committer: Ole John Aske <ole.john.aske@oracle.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Thu 2011-06-16 11:32:43 +0200
    message:
      SPJ API update:
      
      The ndbapi for SPJ was not completely in synch with the primary 
      SPJ source (mysql-5.1-telco-7.0-spj-scan-scan). Likely due to some
      late arriving patches when the SPJ api was merged into telco-7.0.
      
      This patch fix this unintentional diff between these branches.
    ------------------------------------------------------------
    revno: 3362.121.137
    committer: Jan Wedvik <jan.wedvik@oracle.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Thu 2011-06-16 10:37:10 +0200
    message:
      This fix affects pushed queries only.
      
      There was an error in the code setting the T_SCAN_REPEATABLE flag. The
      flag was set on the parent of the intended operation rather than on the 
      operation itself. This caused scan ranges for the repeatable scan to be 
      released too early. This gave wrong results when running a bushy scan where
      the scan to be repeated used pruning.
------------------------------------------------------------
revno: 4243 [merge]
committer: magnus.blaudd@oracle.com
branch nick: 7.1
timestamp: Wed 2011-06-15 14:49:14 +0200
message:
  Merge 7.0 -> 7.1
    ------------------------------------------------------------
    revno: 3362.121.136
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2011-06-15 12:55:06 +0200
    message:
      ndb - bug#12589613 - add new config MaxDMLOperationsPerTransaction to limits transactions
    ------------------------------------------------------------
    revno: 3362.121.135 [merge]
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Mon 2011-06-13 14:27:32 +0200
    message:
      ndb - merge 70 to 71
        ------------------------------------------------------------
        revno: 2585.180.53
        committer: Jonas Oreland <jonas@mysql.com>
        branch nick: telco-6.3
        timestamp: Mon 2011-06-13 14:26:22 +0200
        message:
          ndb - bug#61500 - if lastMbytePageNo > invalidatePageNo then move invalidatePageNo forward to lastMbytePageNo fi
    ------------------------------------------------------------
    revno: 3362.121.134
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Mon 2011-06-13 12:38:49 +0200
    message:
      ndb - bug#12651364/mysql-bug-61498 - Ignore mixed version when subscribing to first event
------------------------------------------------------------
revno: 4242 [merge]
committer: magnus.blaudd@oracle.com
branch nick: 7.1
timestamp: Mon 2011-06-13 08:14:56 +0200
message:
  Merge 7.0 -> 7.1
    ------------------------------------------------------------
    revno: 3362.121.133 [merge]
    committer: magnus.blaudd@oracle.com
    branch nick: 7.0
    timestamp: Mon 2011-06-13 08:14:32 +0200
    message:
      Merge 6.3 -> 7.0
        ------------------------------------------------------------
        revno: 2585.180.52
        committer: magnus.blaudd@oracle.com
        branch nick: 6.3
        timestamp: Mon 2011-06-13 08:13:11 +0200
        message:
          ndb
           - fix speclling error in error message, Hearbeat -> Heartbeat
    ------------------------------------------------------------
    revno: 3362.121.132
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Fri 2011-06-10 17:39:17 +0200
    message:
      ndb - improve DBUG_REDO printouts
    ------------------------------------------------------------
    revno: 3362.121.131
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Fri 2011-06-10 17:38:50 +0200
    message:
      ndb autotest - cleanup formatting, and return to $PWD after building
    ------------------------------------------------------------
    revno: 3362.121.130
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Fri 2011-06-10 14:50:28 +0200
    message:
      ndb - fix (rare) timeout problem with SR_DD_* due to excessive amount of old backup
    ------------------------------------------------------------
    revno: 3362.121.129
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Fri 2011-06-10 14:17:51 +0200
    message:
      ndb - fix compile error for configs which does not have rmb/wmb
    ------------------------------------------------------------
    revno: 3362.121.128
    committer: magnus.blaudd@oracle.com
    branch nick: 7.0-bug37153
    timestamp: Thu 2011-06-09 11:20:47 +0200
    message:
      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
    ------------------------------------------------------------
    revno: 3362.121.127
    committer: magnus.blaudd@oracle.com
    branch nick: 7.0
    timestamp: Wed 2011-06-08 21:25:29 +0200
    message:
      ndb
       - remove usage r --init-rpl-role and --rpl-recovery-rank, thay are
          unused/unimplemented and will be removed in a future version anyway. 
    ------------------------------------------------------------
    revno: 3362.121.126
    committer: magnus.blaudd@oracle.com
    branch nick: 7.0
    timestamp: Tue 2011-06-07 15:28:40 +0200
    message:
      ndb
       - remove usage of my_malloc and my_free from ndbapi
------------------------------------------------------------
revno: 4241
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Thu 2011-06-09 15:56:27 -0700
message:
  Change field handling to only send modified fields to the database
  Add default to dn2id table
  Remember the number of fields during initialization of value handlers
------------------------------------------------------------
revno: 4240
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Thu 2011-06-09 14:09:40 -0700
message:
  Added build target run.clusterjdbc which uses JdbcLoad with clusterjdbc configuration
  Added "include" property to specify which operations to run, overriding "exclude"
  Provided for java.util.logging configuration to be set up in any crund properties file
------------------------------------------------------------
revno: 4239 [merge]
committer: Martin Zaun <martin.zaun@oracle.com>
branch nick: ndb-7.1
timestamp: Tue 2011-06-07 12:50:54 -0700
message:
  crund - merge from ndb-7.1-dbg64
    ------------------------------------------------------------
    revno: 4235.2.2
    committer: Martin Zaun <martin.zaun@oracle.com>
    branch nick: ndb-7.1-dbg64
    timestamp: Tue 2011-06-07 10:37:44 -0700
    message:
      crund - initial support for new indy|each|bulk execution modes
    ------------------------------------------------------------
    revno: 4235.2.1
    committer: Martin Zaun <martin.zaun@oracle.com>
    branch nick: ndb-7.1-dbg64
    timestamp: Tue 2011-06-07 07:12:24 -0700
    message:
      crund - preparing for generic CrundLoad class
------------------------------------------------------------
revno: 4238 [merge]
committer: Martin Zaun <martin.zaun@oracle.com>
branch nick: ndb-7.1
timestamp: Tue 2011-06-07 12:48:42 -0700
message:
  merge from ndb-7.1-jtie
    ------------------------------------------------------------
    revno: 4235.1.1
    committer: Martin Zaun <martin.zaun@oracle.com>
    branch nick: ndb-7.1-jtie
    timestamp: Tue 2011-06-07 11:35:02 -0700
    message:
      ndbjtie - fixed jtie unit test
------------------------------------------------------------
revno: 4237 [merge]
committer: magnus.blaudd@oracle.com
branch nick: 7.1
timestamp: Tue 2011-06-07 14:49:08 +0200
message:
  Merge 7.0 -> 7.1
    ------------------------------------------------------------
    revno: 3362.121.125
    committer: magnus.blaudd@oracle.com
    branch nick: 7.0
    timestamp: Tue 2011-06-07 14:48:01 +0200
    message:
      ndb - fix warning about conversion between different datatypes
    ------------------------------------------------------------
    revno: 3362.121.124 [merge]
    committer: magnus.blaudd@oracle.com
    branch nick: 7.0
    timestamp: Tue 2011-06-07 14:36:05 +0200
    message:
      Merge
        ------------------------------------------------------------
        revno: 3362.137.2
        committer: magnus.blaudd@oracle.com
        branch nick: 7.0
        timestamp: Tue 2011-05-31 17:07:46 +0200
        message:
          ndb
           - map the creat_info->storage_media to respective ndb value
             and save it in ndb's datadictionary when creating the table
        ------------------------------------------------------------
        revno: 3362.137.1
        committer: magnus.blaudd@oracle.com
        branch nick: 7.0
        timestamp: Tue 2011-05-31 16:38:10 +0200
        message:
          ndb
           - mark ndbcluster_find_files() as static and remove it from header file
------------------------------------------------------------
revno: 4236 [merge]
committer: magnus.blaudd@oracle.com
branch nick: 7.1
timestamp: Tue 2011-06-07 14:31:16 +0200
message:
  Merge 7.0 -> 7.1
    ------------------------------------------------------------
    revno: 3362.121.123
    committer: magnus.blaudd@oracle.com
    branch nick: 7.0
    timestamp: Tue 2011-06-07 14:29:53 +0200
    message:
      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
    ------------------------------------------------------------
    revno: 3362.121.122 [merge]
    committer: magnus.blaudd@oracle.com
    branch nick: mysql-5.1-telco-7.0
    timestamp: Tue 2011-06-07 14:25:34 +0200
    message:
      Merge
        ------------------------------------------------------------
        revno: 3362.136.3
        committer: magnus.blaudd@oracle.com
        branch nick: 7.0
        timestamp: Wed 2011-05-25 08:52:33 +0200
        message:
          ndb
             - link NdbGetInAddr-t also with the nsl library
        ------------------------------------------------------------
        revno: 3362.136.2
        committer: magnus.blaudd@oracle.com
        branch nick: 7.0
        timestamp: Tue 2011-05-24 16:34:41 +0200
        message:
          ndb
           - Don't define ENOTSUP on Windows if it's already defined
        ------------------------------------------------------------
        revno: 3362.136.1
        committer: magnus.blaudd@oracle.com
        branch nick: 7.0
        timestamp: Tue 2011-05-24 16:33:47 +0200
        message:
          ndb
           - link NdbGetInAddr-t with the socket library
    ------------------------------------------------------------
    revno: 3362.121.121
    committer: Jan Wedvik <jan.wedvik@oracle.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Tue 2011-06-07 14:08:29 +0200
    message:
      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.
    ------------------------------------------------------------
    revno: 3362.121.120 [merge]
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Tue 2011-06-07 13:31:30 +0200
    message:
      ndb - wl4124 - merge ndbapi part into 70
        ------------------------------------------------------------
        revno: 3362.133.44
        committer: jonas oreland <jonas@mysql.com>
        branch nick: mysql-5.1-telco-7.0-wl4124-new0
        timestamp: Tue 2011-06-07 12:03:02 +0200
        message:
          wl4124-new0
          
          1) don't include ndb_global.h in public header-files (since it's not installed)
          2) this leads to move BoundBufWords into impl-class
          3) change testIndexStat to create/drop stat-tables if they're not already there
          4) add testIndexStat to daily-basic
        ------------------------------------------------------------
        revno: 3362.133.43
        committer: Pekka Nousiainen <pekka.nousiainen@oracle.com>
        branch nick: ms-wl4124-70
        timestamp: Mon 2011-06-06 21:23:15 +0300
        message:
          wl#4124 x06_fix.diff
          some warnings (mainly int sizes)
        ------------------------------------------------------------
        revno: 3362.133.42
        committer: Pekka Nousiainen <pekka.nousiainen@oracle.com>
        branch nick: ms-wl4124-70
        timestamp: Mon 2011-06-06 15:18:47 +0300
        message:
          wl#4124 x05_fix.diff
          CXX=gcc and __cxa_guard_acquire
        ------------------------------------------------------------
        revno: 3362.133.41
        committer: Pekka Nousiainen <pekka.nousiainen@oracle.com>
        branch nick: ms-wl4124-70
        timestamp: Mon 2011-06-06 15:18:27 +0300
        message:
          wl#4124 b05_api.diff
          ndbapi methods, utils, test
        ------------------------------------------------------------
        revno: 3362.133.40 [merge]
        committer: Pekka Nousiainen <pekka.nousiainen@oracle.com>
        branch nick: ms-wl4124-70
        timestamp: Sat 2011-06-04 16:06:10 +0300
        message:
          merge main to wl4124-new0
        ------------------------------------------------------------
        revno: 3362.133.39 [merge]
        committer: Jonas Oreland <jonas@mysql.com>
        branch nick: mysql-5.1-telco-7.0-wl4124-new0
        timestamp: Tue 2011-05-31 11:20:16 +0200
        message:
          ndb - merge 70-main back into mysql-5.1-telco-7.0-wl4124-new0
    ------------------------------------------------------------
    revno: 3362.121.119
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Tue 2011-06-07 09:30:36 +0200
    message:
      ndb - fix 2 more upgrade problems with index-stat code
    ------------------------------------------------------------
    revno: 3362.121.118
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Tue 2011-06-07 08:34:14 +0200
    message:
      ndb - fix tux upgrade with ndb_mgmd not having index-stat-options
    ------------------------------------------------------------
    revno: 3362.121.117
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2011-06-01 13:52:51 +0200
    message:
      ndb - remove another windows breaks solaris feture from autotest
    ------------------------------------------------------------
    revno: 3362.121.116
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2011-06-01 10:55:03 +0200
    message:
      ndb - add "|| true" to support sh -e
    ------------------------------------------------------------
    revno: 3362.121.115
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2011-06-01 10:11:39 +0200
    message:
      ndb - remove usage of non-standard grep options added by autotest for windows project
------------------------------------------------------------
revno: 4235
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Thu 2011-06-02 14:43:17 -0700
message:
  Minor cleanup in crund
------------------------------------------------------------
revno: 4234
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Thu 2011-06-02 06:56:47 -0700
message:
  Add LIKE for binary and varbinary columns
------------------------------------------------------------
revno: 4233 [merge]
committer: jonas oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Wed 2011-06-01 09:51:41 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.121.114 [merge]
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2011-06-01 09:40:49 +0200
    message:
      ndb - merge 63 to 70
        ------------------------------------------------------------
        revno: 2585.180.51
        committer: jonas oreland <jonas@mysql.com>
        branch nick: telco-6.3
        timestamp: Wed 2011-06-01 09:14:18 +0200
        message:
          ndb - bug#12598398 - improve error message for "Failed to convert connection"
------------------------------------------------------------
revno: 4232 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Tue 2011-05-31 15:02:43 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.121.113
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Tue 2011-05-31 14:35:28 +0200
    message:
      ndb - remove warnings in new index-stat code
    ------------------------------------------------------------
    revno: 3362.121.112
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Tue 2011-05-31 14:31:39 +0200
    message:
      ndb - supress warning events when discovering that ndb_index_stat table does not exist
    ------------------------------------------------------------
    revno: 3362.121.111
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Tue 2011-05-31 14:30:40 +0200
    message:
      ndb - remove bash-ism in autotest-run.sh
    ------------------------------------------------------------
    revno: 3362.121.110 [merge]
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Tue 2011-05-31 14:28:59 +0200
    message:
      ndb - merge 63 to 70
        ------------------------------------------------------------
        revno: 2585.180.50
        committer: Jonas Oreland <jonas@mysql.com>
        branch nick: telco-6.3
        timestamp: Tue 2011-05-31 13:37:45 +0200
        message:
          ndb - bug-unreported - fix problem when block-level cleanups would not be called if API_FAIL_REQ handling ended in handleApiFailState. This could theoretically lead to e.g memleak of half-assembled signal fragments...
        ------------------------------------------------------------
        revno: 2585.180.49
        committer: Jonas Oreland <jonas@mysql.com>
        branch nick: telco-6.3
        timestamp: Mon 2011-05-30 13:52:38 +0200
        message:
          ndb - bug#12589691 - improve error reporting when api-fail-req seems to happen
    ------------------------------------------------------------
    revno: 3362.121.109
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Tue 2011-05-31 12:54:22 +0200
    message:
      ndb - fix weird solaris gcc3.4.3 compile error
------------------------------------------------------------
revno: 4231 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Tue 2011-05-31 11:19:48 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.121.108 [merge]
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Tue 2011-05-31 10:28:58 +0200
    message:
      ndb - wl4124 - kernel part
        ------------------------------------------------------------
        revno: 3362.133.38
        committer: Pekka Nousiainen <pekka.nousiainen@oracle.com>
        branch nick: ms-wl4124-70
        timestamp: Mon 2011-05-30 11:24:14 +0300
        message:
          wl#4124 d03_systab.diff
          revert NDBCNTR and use TRIX
        ------------------------------------------------------------
        revno: 3362.133.37
        committer: Pekka Nousiainen <pekka.nousiainen@oracle.com>
        branch nick: ms-wl4124-70
        timestamp: Mon 2011-05-30 11:22:11 +0300
        message:
          wl#4124 d02_systab.diff
          minimal kernel-side patch
        ------------------------------------------------------------
        revno: 3362.133.36
        committer: Pekka Nousiainen <pekka.nousiainen@oracle.com>
        branch nick: ms-wl4124-70
        timestamp: Mon 2011-05-30 11:00:00 +0300
        message:
          treename
        ------------------------------------------------------------
        revno: 3362.133.35 [merge]
        committer: Pekka Nousiainen <pekka.nousiainen@oracle.com>
        branch nick: ms-wl4124-70
        timestamp: Sun 2011-05-29 13:55:32 +0300
        message:
          merge from main into wl4124
        ------------------------------------------------------------
        revno: 3362.133.34 [merge]
        committer: Pekka Nousiainen <pekka.nousiainen@oracle.com>
        branch nick: ms-wl4124-70
        timestamp: Wed 2011-05-25 18:03:11 +0300
        message:
          merge from main into wl4124
        ------------------------------------------------------------
        revno: 3362.133.33
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4124-70
        timestamp: Wed 2011-05-25 09:42:30 +0300
        message:
          wl#4124 x04_fix.diff
          cmake build fixes
        ------------------------------------------------------------
        revno: 3362.133.32
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4124-70
        timestamp: Tue 2011-05-24 20:54:07 +0300
        message:
          wl#4124 x03_fix.diff
          windows build fixes
        ------------------------------------------------------------
        revno: 3362.133.31
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4124-70
        timestamp: Tue 2011-05-24 17:26:59 +0300
        message:
          wl#4124 x02_fix.diff
          windows build fixes
        ------------------------------------------------------------
        revno: 3362.133.30
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4124-70
        timestamp: Mon 2011-05-23 18:46:53 +0300
        message:
          wl#4124 x01_fix.diff
          CMakeLists.txt
        ------------------------------------------------------------
        revno: 3362.133.29
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4124-70
        timestamp: Thu 2011-05-19 12:42:34 +0300
        message:
          treename wl4124
        ------------------------------------------------------------
        revno: 3362.133.28
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4124-70
        timestamp: Thu 2011-05-19 12:40:36 +0300
        message:
          wl#4124 b04_tux.diff
          tux stats scan and stats monitor
        ------------------------------------------------------------
        revno: 3362.133.27
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4124-70
        timestamp: Thu 2011-05-19 12:38:03 +0300
        message:
          wl#4124 b03_trix.diff
          trix-suma stats scan and cleanup
        ------------------------------------------------------------
        revno: 3362.133.26
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4124-70
        timestamp: Thu 2011-05-19 12:18:04 +0300
        message:
          wl#4124 b02_dict.diff
          dict stats schema op and queueing
        ------------------------------------------------------------
        revno: 3362.133.25
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4124-70
        timestamp: Thu 2011-05-19 12:16:32 +0300
        message:
          wl#4124 b01_sys.diff
          configs, pseudo-cols, sys tables, signals
    ------------------------------------------------------------
    revno: 3362.121.107
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Mon 2011-05-30 10:50:17 +0200
    message:
      ndb - kill warnings for gcc 4.4.3
------------------------------------------------------------
revno: 4230 [merge]
committer: jonas oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Fri 2011-05-27 17:17:53 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.121.106
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Fri 2011-05-27 09:53:31 +0200
    message:
      ndb - move refresh tests into daily-basic...as daily-devel isn't closely monitored
    ------------------------------------------------------------
    revno: 3362.121.105
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Fri 2011-05-27 08:15:17 +0200
    message:
      ndb - fix bug with batch size increase/decrease
    ------------------------------------------------------------
    revno: 3362.121.104
    committer: Jan Wedvik <jan.wedvik@oracle.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Thu 2011-05-26 16:44:59 +0200
    message:
      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.
------------------------------------------------------------
revno: 4229
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Thu 2011-05-26 14:07:43 -0700
message:
  Update clusterj poms to 7.1.15
------------------------------------------------------------
revno: 4228
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Thu 2011-05-26 14:04:45 -0700
message:
  Add operator like to clusterj query
------------------------------------------------------------
revno: 4227 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Thu 2011-05-26 14:42:11 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.121.103
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Thu 2011-05-26 13:54:16 +0200
    message:
      ndb - fix bug in DbtcProxy...worker instances are named 1..N
    ------------------------------------------------------------
    revno: 3362.121.102
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Thu 2011-05-26 13:52:38 +0200
    message:
      ndb - fix node-failure for Dbtc/DbtcProxy
    ------------------------------------------------------------
    revno: 3362.121.101
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Thu 2011-05-26 13:49:47 +0200
    message:
      ndb - implement support for multi DIVERIFY_queue's
    ------------------------------------------------------------
    revno: 3362.121.100
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Thu 2011-05-26 13:10:07 +0200
    message:
      ndb fix incorrect assertion (only in mt case...seen in real life)
------------------------------------------------------------
revno: 4226 [merge]
committer: Frazer Clement <frazer.clement@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Wed 2011-05-25 15:35:46 +0100
message:
  Merge 7.0->7.1
    ------------------------------------------------------------
    revno: 3362.121.99
    committer: Frazer Clement <frazer.clement@oracle.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Wed 2011-05-25 15:31:47 +0100
    message:
      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.
------------------------------------------------------------
revno: 4225 [merge]
committer: Frazer Clement <frazer.clement@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Wed 2011-05-25 15:11:22 +0100
message:
  Merge 7.0->7.1
    ------------------------------------------------------------
    revno: 3362.121.98
    committer: Frazer Clement <frazer.clement@oracle.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Wed 2011-05-25 14:19:02 +0100
    message:
      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.
------------------------------------------------------------
revno: 4224 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Wed 2011-05-25 12:11:58 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.121.97
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2011-05-25 11:31:27 +0200
    message:
      ndb - allow spj/tc to do cross-thread execute-direct for DIGETNODES/DIVERIFYREQ
    ------------------------------------------------------------
    revno: 3362.121.96
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2011-05-25 11:30:37 +0200
    message:
      ndb - implement a thread-safe emptyverificbuffer
    ------------------------------------------------------------
    revno: 3362.121.95
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2011-05-25 10:33:14 +0200
    message:
      ndb - add "locking"(NdbSeqLock) for mt-DIVERIFYREQ
    ------------------------------------------------------------
    revno: 3362.121.94
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2011-05-25 10:32:31 +0200
    message:
      ndb - add "locking"(NdbSeqLock) for mt-DIGETNODES
    ------------------------------------------------------------
    revno: 3362.121.93
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2011-05-25 09:58:32 +0200
    message:
      ndb - change implementation of DIVERIFY_queue to be a srsw array based queue (easy to make thread safe) instead of linked-list
    ------------------------------------------------------------
    revno: 3362.121.92
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2011-05-25 08:58:00 +0200
    message:
      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)
------------------------------------------------------------
revno: 4223
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Tue 2011-05-24 18:53:01 -0700
message:
  Fix storage of date and time for big endian
------------------------------------------------------------
revno: 4222
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Tue 2011-05-24 13:42:28 -0700
message:
  Fix storage of tinyint and year for big endian
------------------------------------------------------------
revno: 4221 [merge]
committer: jonas oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Tue 2011-05-24 17:08:14 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.121.91 [merge]
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Tue 2011-05-24 17:06:09 +0200
    message:
      ndb - merge 63 to 70
        ------------------------------------------------------------
        revno: 2585.180.48
        committer: jonas oreland <jonas@mysql.com>
        branch nick: telco-6.3
        timestamp: Tue 2011-05-24 16:51:54 +0200
        message:
          ndb - bug#12586190
            Fix uninitialized variables in Qmgr (move from sp1 to constructor)
            Can cause signal 11 during very early start
              as TIME_SIGNAL are sent before other blocks
              are initialized
------------------------------------------------------------
revno: 4220 [merge]
committer: magnus.blaudd@oracle.com
branch nick: 7.1
timestamp: Tue 2011-05-24 14:16:31 +0200
message:
  Merge 7.0 -> 7.1
    ------------------------------------------------------------
    revno: 3362.121.90 [merge]
    committer: magnus.blaudd@oracle.com
    branch nick: 7.0
    timestamp: Tue 2011-05-24 13:53:50 +0200
    message:
      Merge
        ------------------------------------------------------------
        revno: 3362.135.1
        committer: Magnus Bl?udd <magnus.blaudd@sun.com>
        branch nick: 7.0
        timestamp: Tue 2011-05-24 13:41:58 +0200
        message:
          ndb
           - add MCP patch for BUG#58076 libmysql fails incremental build in some VS versions
           - turn off incremental linking accoring to MS recomendation, they will not issue a hotfix
             although issue is fixed internally
           - Only affecting 5.1
    ------------------------------------------------------------
    revno: 3362.121.89
    committer: magnus.blaudd@oracle.com
    branch nick: 7.0
    timestamp: Tue 2011-05-24 13:51:39 +0200
    message:
      ndb
       - reduce make system magic by including the necessary by relative path
        instead of global include paths when accessing private internals
------------------------------------------------------------
revno: 4219 [merge]
committer: magnus.blaudd@oracle.com
branch nick: 7.1
timestamp: Tue 2011-05-24 13:42:13 +0200
message:
  Merge 7.0 -> 7.1
    ------------------------------------------------------------
    revno: 3362.121.88 [merge]
    committer: magnus.blaudd@oracle.com
    branch nick: mysql-5.1-telco-7.0
    timestamp: Tue 2011-05-24 11:05:55 +0200
    message:
      Merge
        ------------------------------------------------------------
        revno: 3362.134.3
        committer: Magnus Bl?udd <magnus.blaudd@sun.com>
        branch nick: 7.0
        timestamp: Tue 2011-05-24 10:45:38 +0200
        message:
          ndb
           - add support for operating system specific platform checks for storage/ndb/ in a similar way
            as MySQL Server already have. I.e files in storage/ndb/os/ is included if their name match
           the current OS name, version and processor.
           - add precached settings for Windows to reduce the time it takes to run cmake on Windows and
            also improve reliability in the checks(build farm have shown random failures when running the checks
            large number times - if this is a build farm or cmake problem has not been determined)
        ------------------------------------------------------------
        revno: 3362.134.2
        committer: magnus.blaudd@oracle.com
        branch nick: 7.0
        timestamp: Tue 2011-05-24 10:34:45 +0200
        message:
          ndb
           - fix spelling error in the HAVE_ variable for sched_setaffinity
           - only Windows which does not have sched_setaffinity uses this code and
             thus no release version is affected
        ------------------------------------------------------------
        revno: 3362.134.1
        committer: magnus.blaudd@oracle.com
        branch nick: 7.0
        timestamp: Tue 2011-05-24 10:33:20 +0200
        message:
          ndb - remove temporary debug output of cmake's error and out log
------------------------------------------------------------
revno: 4218 [merge]
committer: jonas oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Tue 2011-05-24 10:46:21 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.121.87 [merge]
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Tue 2011-05-24 10:44:31 +0200
    message:
      ndb - merge 63 to 70
        ------------------------------------------------------------
        revno: 2585.180.47
        committer: jonas oreland <jonas@mysql.com>
        branch nick: telco-6.3
        timestamp: Tue 2011-05-24 10:37:36 +0200
        message:
          ndb - bumb version to 6.3.45
    ------------------------------------------------------------
    revno: 3362.121.86
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Tue 2011-05-24 10:38:04 +0200
    message:
      bumb version to 7.0.26
------------------------------------------------------------
revno: 4217
committer: jonas oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Tue 2011-05-24 10:38:22 +0200
message:
  bump version to 7.1.15
------------------------------------------------------------
revno: 4216 [merge]
tags: clone-mysql-5.1.56-ndb-7.1.14-src-build
committer: jonas oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Tue 2011-05-24 10:02:24 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.121.85
    tags: clone-mysql-5.1.56-ndb-7.0.25-src-build
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Tue 2011-05-24 07:27:15 +0200
    message:
      ndb - remove unused variable
