------------------------------------------------------------
revno: 4537 [merge]
tags: clone-mysql-5.1.61-ndb-7.1.22-src-build
committer: Mauritz Sundell <mauritz.sundell@oracle.com>
branch nick: mysql-5.1-telco-7.1-debug
timestamp: Thu 2012-04-26 13:45:28 +0200
message:
  merge 7.0 -> 7.1
    ------------------------------------------------------------
    revno: 3362.176.9
    tags: clone-mysql-5.1.61-ndb-7.0.33-src-build
    committer: Mauritz Sundell <mauritz.sundell@oracle.com>
    branch nick: mysql-5.1-telco-7.0-bug14000373
    timestamp: Thu 2012-04-26 12:33:16 +0200
    message:
      ndb - bug#14000373, reintroduce 64K limit on hash index pages (~45Mrows)
      
      bug#13844405 should be reopened
------------------------------------------------------------
revno: 4536 [merge]
committer: Martin Zaun <martin.zaun@oracle.com>
branch nick: ndb-7.1
timestamp: Tue 2012-04-24 11:15:47 -0700
message:
  merge from ndb-7.1-ndbjtie-constants-test
    ------------------------------------------------------------
    revno: 4535.1.1
    committer: Martin Zaun <martin.zaun@oracle.com>
    branch nick: ndb-7.1-ndbjtie-constants-test
    timestamp: Tue 2012-04-24 11:11:46 -0700
    message:
      ndbjtie - fixed gcc40 compile ndbjtie-constants-test
------------------------------------------------------------
revno: 4535 [merge]
committer: Frazer Clement <frazer.clement@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Tue 2012-04-24 16:13:35 +0100
message:
  Merge 7.0->7.1
    ------------------------------------------------------------
    revno: 3362.176.8 [merge]
    committer: Frazer Clement <frazer.clement@oracle.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Tue 2012-04-24 16:10:04 +0100
    message:
      Merge 6.3->7.0
        ------------------------------------------------------------
        revno: 2585.187.10
        committer: Frazer Clement <frazer.clement@oracle.com>
        branch nick: mysql-5.1-telco-6.3
        timestamp: Tue 2012-04-24 16:07:32 +0100
        message:
          Bug #13986128 DUMP LCP RESERVED FRAGMENT SCAN RECORD AS PART OF LCP STATUS DUMP
------------------------------------------------------------
revno: 4534 [merge]
committer: Frazer Clement <frazer.clement@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Tue 2012-04-24 15:24:54 +0100
message:
  Merge 7.0->7.1
    ------------------------------------------------------------
    revno: 3362.176.7
    committer: Frazer Clement <frazer.clement@oracle.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Tue 2012-04-24 15:11:49 +0100
    message:
      Bug#13985076 NDBINFO : ADD TC SCAN RECORDS TO POOLS TABLE
------------------------------------------------------------
revno: 4533 [merge]
committer: Frazer Clement <frazer.clement@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Tue 2012-04-24 15:22:40 +0100
message:
  Merge 7.0->7.1
    ------------------------------------------------------------
    revno: 3362.176.6 [merge]
    committer: Frazer Clement <frazer.clement@oracle.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Tue 2012-04-24 14:17:43 +0100
    message:
      Merge 6.3->7.0.
      
      Adjust scan release code to conditionally send DIH_SCAN_COMPLETE_REP
        ------------------------------------------------------------
        revno: 2585.187.9
        committer: Frazer Clement <frazer.clement@oracle.com>
        branch nick: mysql-5.1-telco-6.3
        timestamp: Tue 2012-04-24 11:55:03 +0100
        message:
          Bug#13966723 MYSQL CLUSTER - CONCURRENT OPERATIONS 'LEAK' RESULTS IN "TOO MANY ACTIVE SCANS"
          
          TC had a bug where a shortage of TC scan fragment records resulted in
          a leak of scan table records and key operations.
          
          This is fixed, and a testcase added.
------------------------------------------------------------
revno: 4532 [merge]
committer: Martin Zaun <martin.zaun@oracle.com>
branch nick: ndb-7.1
timestamp: Thu 2012-04-19 11:43:44 -0700
message:
  merge from ndb-7.1-ndbjtie-constants-test
    ------------------------------------------------------------
    revno: 4531.1.1
    committer: Martin Zaun <martin.zaun@oracle.com>
    branch nick: ndb-7.1-ndbjtie-constants-test
    timestamp: Thu 2012-04-19 03:46:43 -0700
    message:
      ndbjtie - added unit test verifying all mapped/copied enums/constants against their value in ndbapi by Java Reflection.
------------------------------------------------------------
revno: 4531 [merge]
committer: magnus.blaudd@oracle.com
branch nick: 7.1
timestamp: Mon 2012-04-16 12:33:30 +0200
message:
  Merge 7.0 -> 7.1
    ------------------------------------------------------------
    revno: 3362.176.5
    committer: magnus.blaudd@oracle.com
    branch nick: 7.0
    timestamp: Mon 2012-04-16 12:30:41 +0200
    message:
      ndb
       - make ndb_config --configinfo --xml print the allowed values
         to set for config variables of enum type
------------------------------------------------------------
revno: 4530
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Sat 2012-04-14 20:45:31 -0700
message:
  Remove dependency on junit for testing clusterj
------------------------------------------------------------
revno: 4529
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Sat 2012-04-14 20:43:47 -0700
message:
  Add iterations to multi-range index scan
------------------------------------------------------------
revno: 4528
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Sat 2012-04-14 20:42:07 -0700
message:
  Ignore long-running tests in cluterj-tie
------------------------------------------------------------
revno: 4527
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Sat 2012-04-14 20:40:55 -0700
message:
  Remove test methods not in clusterj-unit
------------------------------------------------------------
revno: 4526
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Sat 2012-04-14 14:37:35 -0700
message:
  Implement mock clusterj-unit allowing clusterj tests to be run without depending on junit(tm).
------------------------------------------------------------
revno: 4525 [merge]
committer: magnus.blaudd@oracle.com
branch nick: mysql-5.1-telco-7.1
timestamp: Fri 2012-04-13 12:47:43 +0200
message:
  Merge
    ------------------------------------------------------------
    revno: 4523.1.1 [merge]
    committer: magnus.blaudd@oracle.com
    branch nick: 7.1
    timestamp: Fri 2012-04-13 11:49:27 +0200
    message:
      Merge 7.0 -> 7.1
        ------------------------------------------------------------
        revno: 3362.176.4
        committer: magnus.blaudd@oracle.com
        branch nick: 7.0
        timestamp: Fri 2012-04-13 11:46:42 +0200
        message:
          ndb
           - remove unnecessary ifdef, all versions have OPTION_ALLOW_BATCH now
------------------------------------------------------------
revno: 4524
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Thu 2012-04-12 13:59:50 -0700
message:
  Clusterj tests -- remove methods not implemented by clusterj mock junit.
------------------------------------------------------------
revno: 4523 [merge]
committer: magnus.blaudd@oracle.com
branch nick: 7.1
timestamp: Wed 2012-04-11 11:26:01 +0200
message:
  Merge 7.0 -> 7.1
    ------------------------------------------------------------
    revno: 3362.176.3 [merge]
    committer: magnus.blaudd@oracle.com
    branch nick: mysql-5.1-telco-7.0
    timestamp: Wed 2012-04-11 09:50:15 +0200
    message:
      Merge
        ------------------------------------------------------------
        revno: 3362.177.2
        committer: magnus.blaudd@oracle.com
        branch nick: 7.0
        timestamp: Wed 2012-04-11 09:17:49 +0200
        message:
          WL#6224 Adapt MySQL Cluster to 5.6
           - Remove use of 'select * from information_schema.columns' to not depend
             so much on changes in the output that command in different versions of
             MySQL Server(and also diff between server and embedded)
        ------------------------------------------------------------
        revno: 3362.177.1
        committer: magnus.blaudd@oracle.com
        branch nick: 7.0
        timestamp: Thu 2012-03-29 10:26:51 +0200
        message:
          ndb
           - remove unused -slave.opt file for ndb_rpl_relayrotate
    ------------------------------------------------------------
    revno: 3362.176.2
    committer: Mauritz Sundell <mauritz.sundell@oracle.com>
    branch nick: mysql-5.1-telco-7.0-pushed
    timestamp: Tue 2012-04-10 15:58:06 +0200
    message:
      ndb - allow upgrade from 7.x to 7.3
------------------------------------------------------------
revno: 4522
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Sun 2012-04-08 13:50:07 -0700
message:
  Clusterj big endian bit types fix
------------------------------------------------------------
revno: 4521
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Fri 2012-04-06 19:06:08 -0700
message:
  Fix clusterj big endian bit handling for boolean, byte, and short
------------------------------------------------------------
revno: 4520
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Thu 2012-04-05 19:57:27 -0700
message:
  Clusterj fix big endian bit mapped to short
------------------------------------------------------------
revno: 4519
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Thu 2012-04-05 08:12:21 -0700
message:
  Fix clusterj bit 1-8 types for big endian
------------------------------------------------------------
revno: 4518
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Wed 2012-04-04 23:37:40 -0700
message:
  Clusterj NdbRecord big endian patch try number two
------------------------------------------------------------
revno: 4517
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Wed 2012-04-04 22:45:15 -0700
message:
  Improve clusterj NdbRecord handling for long values (time, date, timestamp) for big endian.
------------------------------------------------------------
revno: 4516
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Tue 2012-04-03 23:46:06 -0700
message:
  Improve multi-range query in test
------------------------------------------------------------
revno: 4515
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Tue 2012-04-03 23:22:39 -0700
message:
  Improve logging diagnostics for schema change test
------------------------------------------------------------
revno: 4514
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Tue 2012-04-03 17:32:48 -0700
message:
  Improve clusterj DbugTest to use system-independent file name
------------------------------------------------------------
revno: 4513
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Mon 2012-04-02 18:18:50 -0700
message:
  Fix tempdir problem on windows
------------------------------------------------------------
revno: 4512
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Mon 2012-04-02 13:43:14 -0700
message:
  Implement unique key read, index scan, and table scan using NdbRecord for clusterj.
  Implement scan lock takeover for index scan and table scan for both NdbRecord and non-NdbRecord.
  This allows any rows read with a lock mode not read committed to have locks held after the scan.
------------------------------------------------------------
revno: 4511 [merge]
committer: Martin Zaun <martin.zaun@oracle.com>
branch nick: ndb-7.1
timestamp: Thu 2012-03-29 23:55:51 -0700
message:
  merge from 70 to 71
    ------------------------------------------------------------
    revno: 3362.176.1 [merge]
    committer: Martin Zaun <martin.zaun@oracle.com>
    branch nick: ndb-7.0
    timestamp: Thu 2012-03-29 23:53:05 -0700
    message:
      Bug54854 - merge from ndb-7.0-ddl-exist-errors to ndb-7.0
------------------------------------------------------------
revno: 4510 [merge]
committer: Martin Zaun <martin.zaun@oracle.com>
branch nick: ndb-7.1
timestamp: Thu 2012-03-29 23:53:59 -0700
message:
  Bug54854 - merge from ndb-7.1-ddl-exist-errors to ndb-7.1
    ------------------------------------------------------------
    revno: 4509.1.1 [merge]
    committer: Martin Zaun <martin.zaun@oracle.com>
    branch nick: ndb-7.1-ddl-exist-errors
    timestamp: Thu 2012-03-29 23:19:45 -0700
    message:
      Bug54854 - merge from 70 to 71
        ------------------------------------------------------------
        revno: 3362.173.7
        committer: Martin Zaun <martin.zaun@oracle.com>
        branch nick: ndb-7.0-ddl-exist-errors
        timestamp: Thu 2012-03-29 22:19:18 -0700
        message:
          Bug54854 - fixed MCP tags
------------------------------------------------------------
revno: 4509
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Thu 2012-03-29 10:42:19 -0700
message:
  Bump clusterj version to 7.1.22
------------------------------------------------------------
revno: 4508 [merge]
committer: Jonas Oreland <jonas.oreland@oracle.com>
branch nick: telco-7.1
timestamp: Thu 2012-03-29 19:25:20 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.173.6
    committer: Frazer Clement <frazer.clement@oracle.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Thu 2012-03-29 15:30:27 +0100
    message:
      Fix funcs_1.is_columns_mysql testcase to reflect new ndb_binlog_index columns
------------------------------------------------------------
revno: 4507 [merge]
committer: Jonas Oreland <jonas.oreland@oracle.com>
branch nick: telco-7.1
timestamp: Thu 2012-03-29 08:58:35 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.173.5
    committer: Frazer Clement <frazer.clement@oracle.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Thu 2012-03-29 00:00:01 +0100
    message:
      Attempt testcase stability fix for ndb_binlog_index
------------------------------------------------------------
revno: 4506
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Wed 2012-03-28 17:25:53 -0700
message:
  Improve length validation for variable columns; remove check for 8000 characters in columns
  Add check for data exceeding column size
  Thanks to ted.wennmark@oracle.com
------------------------------------------------------------
revno: 4505 [merge]
committer: Frazer Clement <frazer.clement@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Wed 2012-03-28 16:30:10 +0100
message:
  Merge 7.0->7.1
    ------------------------------------------------------------
    revno: 3362.173.4
    committer: Frazer Clement <frazer.clement@oracle.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Wed 2012-03-28 16:17:32 +0100
    message:
      Bug#54854 / Bug#11762277 CAN'T FIND GOOD POSITION FOR REPLICATION BREAK BETWEEN DDL STATEMENTS 
      
      Problem
      -------
      
      Replication channel cutover uses the last applied epoch on the slave to determine where
      to begin replication from on the new Master.
      
      The last applied epoch is obtained from the Slave's mysql.ndb_apply_status table.
      The new Master's mysql.ndb_binlog_index table is queried to find the first epoch *after* the
      Slave's last applied epoch, the binlog file and offset of this epoch are used to start
      replication from the new master.
      
      Issues : 
       1) There may be *no* epoch after the last applied epoch
          If log-empty-epochs=0, and even in normal cases, where the slave is up-to-date and
          no new epoch has been finalised on the Master.
       2) As epochs are not continuously numbered, there may be a gap between the last applied
          epoch and the next.  It is not possible to determine what the next epoch number will
          be.  If the new Master is missing some epochs, the current cutover mechanism will 
          silently skip over them and jump to the first available epoch 
       3) Where there is DDL between the last applied epoch and the next epoch, the cutover mechanism
          will skip the DDL.  If the DDL has been applied then this is ok, if it has not, then it
          is silently skipped.
      
      Solution
      --------
      
      This series implements a more precise mechanism for performing replication channel cutover.
      This allows us to ensure that a replication channel cutover begins replication precisely
      after the end of the last committed epoch on the Slave.
      
      This involves :
        - Modifications to the MySQL Server Binlog code to record the next position in the Binlog
          after the COMMIT event at the end of an epoch transaction
        - Modifications to the mysql.ndb_binlog_index table schema to include next_file and next_position
          columns
        - Modifications to the Ndb Binlog injector to set the next_file and next_position columns in
          the mysql.ndb_binlog_index table.
      
      The existing replication channel cutover mechanism continues to work, with the same limitations
      as before.
      A new channel cutover mechanism is defined, making use of the new columns.
      
      Old channel cutover mechanism, given a last applied epoch from the slave.
      
        SELECT File, position from mysql.ndb_binlog_index where epoch > <last_applied_epoch>;
      
      New channel cutover mechanism :
        SELECT next_file, next_position from mysql.ndb_binlog_index where epoch = <last_applied_epoch>;
      
      Note that i) This statement uses the last applied epoch directly - there is no dependency on there
      being a following epoch, ii) There is no risk of silently 'jumping' over an epoch gap during 
      replication channel cutover, iii) Any DDL after the last applied epoch will be (re)applied.
      
      Reapplying inter-epoch DDL can result in errors on the Slave.  This is considered better than the
      old channel cutover mechanism which can result in silently skipping DDL.  A separate patch series
      implements 'DDL ignore existance errors' handling.
      
      This series includes a testcase which verifies the correctness of the next_position under 
      multithreaded Binlog inserts etc.
------------------------------------------------------------
revno: 4504 [merge]
committer: Frazer Clement <frazer.clement@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Wed 2012-03-28 15:58:37 +0100
message:
  Merge 7.0->7.1
    ------------------------------------------------------------
    revno: 3362.173.3
    committer: Jonas Oreland <jonas.oreland@oracle.com>
    branch nick: telco-7.0
    timestamp: Wed 2012-03-28 16:30:55 +0200
    message:
      ndb - bump version to 7.0.33
    ------------------------------------------------------------
    revno: 3362.173.2 [merge]
    tags: clone-mysql-5.1.61-ndb-7.0.32-src-build
    committer: magnus.blaudd@oracle.com
    branch nick: mysql-5.1-telco-7.0
    timestamp: Tue 2012-03-27 09:02:26 +0200
    message:
      Merge
------------------------------------------------------------
revno: 4503
committer: Jonas Oreland <jonas.oreland@oracle.com>
branch nick: telco-7.1
timestamp: Wed 2012-03-28 16:31:35 +0200
message:
  ndb - bump version to 7.1.22
------------------------------------------------------------
revno: 4502 [merge]
tags: clone-mysql-5.1.61-ndb-7.1.21-src-build
committer: magnus.blaudd@oracle.com
branch nick: mysql-5.1-telco-7.1
timestamp: Tue 2012-03-27 11:24:50 +0200
message:
  Merge
    ------------------------------------------------------------
    revno: 4493.1.1 [merge]
    committer: magnus.blaudd@oracle.com
    branch nick: 7.1
    timestamp: Wed 2012-03-21 16:31:47 +0100
    message:
      Merge 7.0 -> 7.1
        ------------------------------------------------------------
        revno: 3362.174.2 [merge]
        committer: magnus.blaudd@oracle.com
        branch nick: 7.0
        timestamp: Wed 2012-03-21 16:29:40 +0100
        message:
          ndbcluster
           - move the debug only variable which ndbcluster installs
             into ndb_dbg_ namespace, making it easier to write test cases
             which does not depend on them
            ------------------------------------------------------------
            revno: 3362.175.1
            committer: magnus.blaudd@oracle.com
            branch nick: 7.0
            timestamp: Wed 2012-03-21 07:28:31 +0100
            message:
              ndbcluster
               - move the debug only variable which ndbcluster installs
                 into ndb_dbg_ namespace, making it easier to write test cases
                 which does not depend on them
        ------------------------------------------------------------
        revno: 3362.174.1
        committer: magnus.blaudd@oracle.com
        branch nick: 7.0
        timestamp: Wed 2012-03-21 16:14:51 +0100
        message:
          BUG#13857301 NDB_MGMD NOT STARTING WHEN USING --SKIP-CONFIG-CACHE OPTION
           - Problem occured when ndb_mgmd was started with --initial and --skip-config-cache. The function used to delete any old saved configs returned false when running without configdir. Changed the function to return true for the above case.
           - Also spotted a problem with --skip-config-cache and fetching the config from another mgmd, it would eventually have tried to save the config in the non existing configdir.
           - Added testcases for "--initial --skip-config-cache" and "--skip-config-cache + fetch"
