------------------------------------------------------------
revno: 4217
committer: Kent Boortz <kent.boortz@oracle.com>
branch nick: mysql-7.1.14-release
timestamp: Fri 2011-06-10 14:17:35 +0200
message:
  Added missing return of value in read_lock()
------------------------------------------------------------
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
------------------------------------------------------------
revno: 4215 [merge]
committer: Frazer Clement <frazer.clement@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Mon 2011-05-23 17:21:16 +0100
message:
  Merge  7.0->7.1
    ------------------------------------------------------------
    revno: 3362.121.84
    committer: Frazer Clement <frazer.clement@oracle.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Mon 2011-05-23 17:13:34 +0100
    message:
      Fix testRestartGci
------------------------------------------------------------
revno: 4214
committer: magnus.blaudd@oracle.com
branch nick: 7.1
timestamp: Mon 2011-05-23 17:29:50 +0200
message:
  ndbinfo
   - use the new ndbinfo_offline mode in the mysql_system_table.sql script
   (which is used by mysql_upgrade)
------------------------------------------------------------
revno: 4213 [merge]
committer: magnus.blaudd@oracle.com
branch nick: 7.1
timestamp: Mon 2011-05-23 16:50:45 +0200
message:
  Merge 7.0 -> 7.1
    ------------------------------------------------------------
    revno: 3362.121.83
    committer: magnus.blaudd@oracle.com
    branch nick: 7.0
    timestamp: Mon 2011-05-23 16:05:08 +0200
    message:
      Bug#12581954 - ndbinfo need to reload its cache of ndbinfo tables during online upgrade
       - When upgrading the MySQL Servers in a cluster before the datanodes, the
        ndbinfo API does not flush it's cache of ndbinfo tables and columns. Only
        full disconnect of the cluster is currently detected. And of course
        restarting the MySQL Server 
       - Make ndbinfo api detect when the "min db version" of cluster has changed.
    ------------------------------------------------------------
    revno: 3362.121.82
    committer: magnus.blaudd@oracle.com
    branch nick: 7.0
    timestamp: Mon 2011-05-23 15:45:57 +0200
    message:
      Bug#12581895 - ndbinfo should support opening tables with more or differently named columns
       - Add support for opening a table with more fields than exist in NDBINFO,
         all fields not sent by NDB will be set to NULL
       - Add check to prevent opening a table with fields which are NOT NULL
       - Extend NdbInfoRecAttr with isNULL()
    ------------------------------------------------------------
    revno: 3362.121.81
    committer: magnus.blaudd@oracle.com
    branch nick: 7.0
    timestamp: Mon 2011-05-23 14:09:04 +0200
    message:
      ndbinfo
       - rename all option variables in ndbinfo to have "opt_ndbinfo_" as prefix 
    ------------------------------------------------------------
    revno: 3362.121.80
    committer: magnus.blaudd@oracle.com
    branch nick: 7.0
    timestamp: Mon 2011-05-23 13:57:55 +0200
    message:
      Bug#11885602 - mysql_upgrade fails upgrading from 7.1.8 to later release
       - It was allowed to CREATE TABLE which was not in NDB, but
         creating a view on that table failed since the table has to
         be opened as part of the create.
       - Make it possible to workaround this with a new "ndbinfo_offline"
         mode which allows tables to be created and opened although they
         don't exist or have different table definition. This is exactly
         the same behaviour as when NDBCLUSTER is disabled. SELECTs on a
         table which has been opened in offline mode, return no rows
         and a warning is printed(like before).
------------------------------------------------------------
revno: 4212 [merge]
committer: magnus.blaudd@oracle.com
branch nick: 7.1
timestamp: Mon 2011-05-23 16:15:59 +0200
message:
  Merge 7.0 -> 7.1
    ------------------------------------------------------------
    revno: 3362.121.79
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Mon 2011-05-23 12:38:41 +0200
    message:
      ndb - bug#12581213 fix accounting of MaxNoOfOpenFiles vs. unbound files (data files)
    ------------------------------------------------------------
    revno: 3362.121.78 [merge]
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Fri 2011-05-20 07:11:01 +0200
    message:
      ndb - merge wl4163
        ------------------------------------------------------------
        revno: 3362.133.24 [merge]
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Tue 2011-05-17 15:24:52 +0200
        message:
          merge to wl4163
        ------------------------------------------------------------
        revno: 3362.133.23 [merge]
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Tue 2011-05-17 14:47:21 +0200
        message:
          merge to wl4163
        ------------------------------------------------------------
        revno: 3362.133.22
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Tue 2011-05-17 14:19:20 +0200
        message:
          wl#4163 i05_fix.diff
          remove debug buffer from stack (MT build 8k stack)
        ------------------------------------------------------------
        revno: 3362.133.21
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Mon 2011-05-09 18:35:25 +0300
        message:
          wl#4163 i04_fix.diff
          size_t warning on windows + NdbPack-t link libs
        ------------------------------------------------------------
        revno: 3362.133.20
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Mon 2011-05-09 12:02:39 +0300
        message:
          wl#4163 i03_fix.diff
          no random() on windows, use ndb_rand()
        ------------------------------------------------------------
        revno: 3362.133.19
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Sun 2011-05-08 11:15:58 +0300
        message:
          wl#4163 i02_fix.diff
          signed vs unsigned warnings
        ------------------------------------------------------------
        revno: 3362.133.18
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Thu 2011-05-05 17:32:32 +0300
        message:
          wl#4163 i01_fix.diff
          signed vs unsigned warnings + TAP "ok"
        ------------------------------------------------------------
        revno: 3362.133.17
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Wed 2011-05-04 19:04:33 +0300
        message:
          wl#4163 h06_sqlutil.diff
          date types
        ------------------------------------------------------------
        revno: 3362.133.16
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Wed 2011-05-04 18:10:05 +0300
        message:
          wl#4163 h05_sqlutil.diff
          decimal types
        ------------------------------------------------------------
        revno: 3362.133.15
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Wed 2011-05-04 18:07:57 +0300
        message:
          wl#4163 h04_sqlutil.diff
          string types
        ------------------------------------------------------------
        revno: 3362.133.14
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Wed 2011-05-04 18:03:36 +0300
        message:
          wl#4163 h03_sqlutil.diff
          number types
        ------------------------------------------------------------
        revno: 3362.133.13
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Wed 2011-05-04 17:45:46 +0300
        message:
          wl#4163 h02_sqlutil.diff
          remove compare of partial values (interface only)
        ------------------------------------------------------------
        revno: 3362.133.12
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Wed 2011-05-04 17:41:42 +0300
        message:
          wl#4163 h01_sqlutil.diff
          remove binary type concept
        ------------------------------------------------------------
        revno: 3362.133.11
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Wed 2011-05-04 15:29:26 +0300
        message:
          wl#4163 g07_ops.diff
          remove obsolete tux buffers and methods
        ------------------------------------------------------------
        revno: 3362.133.10
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Wed 2011-05-04 15:25:51 +0300
        message:
          wl#4163 g06_ops.diff
          use node prefix in index scan
        ------------------------------------------------------------
        revno: 3362.133.9
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Wed 2011-05-04 15:24:03 +0300
        message:
          wl#4163 g05_ops.diff
          use node prefix in index update
        ------------------------------------------------------------
        revno: 3362.133.8
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Wed 2011-05-04 15:14:36 +0300
        message:
          wl#4163 g04_ops.diff
          add node prefix back
        ------------------------------------------------------------
        revno: 3362.133.7
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Wed 2011-05-04 15:08:38 +0300
        message:
          wl#4163 g03_ops.diff
          index scan using packed data
        ------------------------------------------------------------
        revno: 3362.133.6
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Wed 2011-05-04 14:58:38 +0300
        message:
          wl#4163 g02_ops.diff
          index update using packed data
        ------------------------------------------------------------
        revno: 3362.133.5
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Wed 2011-05-04 14:57:39 +0300
        message:
          wl#4163 g01_ops.diff
          temporarily remove node prefix
        ------------------------------------------------------------
        revno: 3362.133.4
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Wed 2011-05-04 13:52:28 +0300
        message:
          wl#4163 f02_desc.diff
          store key types and attr headers in metadata pages
        ------------------------------------------------------------
        revno: 3362.133.3
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Wed 2011-05-04 13:51:37 +0300
        message:
          wl#4163 f01_desc.diff
          remove duplicated metadata from frag level
        ------------------------------------------------------------
        revno: 3362.133.2
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Wed 2011-05-04 12:44:18 +0300
        message:
          wl#4163 e01_pack.diff
          pack ndb data according to spec
        ------------------------------------------------------------
        revno: 3362.133.1
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Sun 2011-05-01 12:20:33 +0300
        message:
          tree_name -wl4163 for next push
    ------------------------------------------------------------
    revno: 3362.121.77 [merge]
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Thu 2011-05-19 20:19:47 +0200
    message:
      ndb - decrease MaxNoOfSavedMessages not to overflow autotest result disk
        ------------------------------------------------------------
        revno: 2585.180.46
        tags: clone-mysql-5.1.56-ndb-6.3.44-src-build
        committer: jonas oreland <jonas@mysql.com>
        branch nick: telco-6.3
        timestamp: Thu 2011-05-19 19:47:28 +0200
        message:
          ndb - decrease MaxNoOfSavedMessages not to overflow autotest result disk
    ------------------------------------------------------------
    revno: 3362.121.76
    committer: magnus.blaudd@oracle.com
    branch nick: 7.0
    timestamp: Thu 2011-05-19 11:05:45 +0200
    message:
      ndb
       - print the version of cmake from storage/ndb/CMakelists.txt
    ------------------------------------------------------------
    revno: 3362.121.75
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Thu 2011-05-19 09:32:39 +0200
    message:
      ndb - assign errno 17000-17999 to Dbspj
    ------------------------------------------------------------
    revno: 3362.121.74
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2011-05-18 12:48:58 +0200
    message:
      ndb - use thrjamX() in Dbdih::execDIGETNODES and Dbdih::execDIVERIFYREQ
    ------------------------------------------------------------
    revno: 3362.121.73
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2011-05-18 11:07:07 +0200
    message:
      ndb - move apiConnectRecord (pool) onto c_diverify_queue
    ------------------------------------------------------------
    revno: 3362.121.72
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2011-05-18 09:46:28 +0200
    message:
      ndb - put diverify-queue into own struct
    ------------------------------------------------------------
    revno: 3362.121.71 [merge]
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2011-05-18 08:28:19 +0200
    message:
      ndb - merge 63 to 70
        ------------------------------------------------------------
        revno: 2585.180.45
        committer: jonas oreland <jonas@mysql.com>
        branch nick: telco-6.3
        timestamp: Wed 2011-05-18 08:26:58 +0200
        message:
          ndb - add another possible error
------------------------------------------------------------
revno: 4211
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Fri 2011-05-20 12:54:45 -0700
message:
  Improve setup for query tests
------------------------------------------------------------
revno: 4210
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Thu 2011-05-19 16:24:44 -0700
message:
  Improve cleanup handling for query tests
------------------------------------------------------------
revno: 4209
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Thu 2011-05-19 16:23:52 -0700
message:
  Fix documentation for the table used in the test
------------------------------------------------------------
revno: 4208
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Thu 2011-05-19 14:18:12 -0700
message:
  Updated Makefile and CMake scripts for clusterj:
  clusterj/Makefile.am fixed export clusterj-core packages, added clusterj-jdbc packages
  clusterj-jpatest/Makefile.am added export packages
  clusterj-test/Makefile.am fixed bundle name, added export packages
  clusterj-test/CMakeLists.txt fixed export package names
------------------------------------------------------------
revno: 4207
committer: John David Duncan <john.duncan@oracle.com>
branch nick: telco-7.1-temp
timestamp: Wed 2011-05-18 19:58:00 -0700
message:
  mysql-test/suite/ndb/include/have_openjpa.inc: handle CLASSPATH separator for both unix & windows
------------------------------------------------------------
revno: 4206 [merge]
committer: jonas oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Wed 2011-05-18 08:06:49 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.121.70
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2011-05-18 07:25:47 +0200
    message:
      ndb - fix compiler warning
------------------------------------------------------------
revno: 4205 [merge]
committer: Frazer Clement <frazer.clement@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Wed 2011-05-18 00:37:03 +0100
message:
  Merge 7.0->7.1
    ------------------------------------------------------------
    revno: 3362.121.69
    committer: Frazer Clement <frazer.clement@oracle.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Wed 2011-05-18 00:29:55 +0100
    message:
      WL5353 Reflecting GCI
      
      Add NDB$ROW_GCI64 and NDB$ROW_AUTHOR optional pseudo columns.
      
      These pseudo columns are only present if requested at table creation time.
      Both are variable width - 1 to 31 bits.
      
      Pseudo column NDB$ROW_GCI64 gives access to a higher resolution row GCI/epoch
      value.  The number of bits used controls the resolution of the low-word of
      the GCI.  Where the bits are insufficient for an actual epoch, reading the 
      column returns a saturated value in the low-word, and the normal ROW_GCI value
      in the high-word.
      
      Pseudo column NDB$ROW_AUTHOR is automatically set to 0 on INSERT, UPDATE, WRITE
      operations.  It can be explicitly set to some other value.  The intention
      is to allow the identity of the last user/application to write to a row to be
      determined.
      
      ndb_desc is enhanced to indicate the number of bits used for each optional
      pseudo column in a table.
      
      ndb_select_all is enhanced to enable the value of these columns to be
      output.
    ------------------------------------------------------------
    revno: 3362.121.68
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Tue 2011-05-17 15:09:45 +0200
    message:
      ndb - bug#60484 - fix problem seen by testDict -n DictRestart (autotest) with marking/unmarking of m_newTable_realObjectId
------------------------------------------------------------
revno: 4204
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Tue 2011-05-17 14:24:26 -0700
message:
  Update clusterj DeleteAllByClassTest to ignore existing instances
------------------------------------------------------------
revno: 4203
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Tue 2011-05-17 12:55:35 -0700
message:
  Clean up after PartitionKeyTest
------------------------------------------------------------
revno: 4202 [merge]
committer: John David Duncan <john.duncan@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Tue 2011-05-17 12:22:57 -0700
message:
  Merge from working (display Java version number)
    ------------------------------------------------------------
    revno: 4200.1.1
    committer: John David Duncan <john.duncan@oracle.com>
    branch nick: mysql-5.1-telco-7.1
    timestamp: Tue 2011-05-17 12:19:34 -0700
    message:
      In mtr tests to find Java, echo the found Java's version number.
------------------------------------------------------------
revno: 4201
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Tue 2011-05-17 11:38:11 -0700
message:
  Add cleanup to VarcharStringLengthTest
------------------------------------------------------------
revno: 4200
committer: John David Duncan <john.duncan@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Tue 2011-05-17 10:57:32 -0700
message:
  Attempt to fix CLASSPATH issues with ndb.clusterj test on Windows.
  Fix dependency tracking for Make in clusterj.
------------------------------------------------------------
revno: 4199 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Tue 2011-05-17 14:14:32 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.121.67
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Tue 2011-05-17 13:41:50 +0200
    message:
      ndb - make sure Dbdih::TabRecord::m_lock gets initialized
------------------------------------------------------------
revno: 4198 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Tue 2011-05-17 10:40:55 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.121.66
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Tue 2011-05-17 09:57:55 +0200
    message:
      ndb - fix compiler warning in NdbMutex.c
    ------------------------------------------------------------
    revno: 3362.121.65
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Tue 2011-05-17 09:23:31 +0200
    message:
      ndb - fix upgrade wrt extension on tcseizeconf (for mt tc)
    ------------------------------------------------------------
    revno: 3362.121.64
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Tue 2011-05-17 09:06:30 +0200
    message:
      ndb - add a seqlock implementation
        to be used with mt-tc
    ------------------------------------------------------------
    revno: 3362.121.63
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Mon 2011-05-16 14:24:55 +0200
    message:
      ndb - add new function "SimulatedBlock::assertOwnThread" that can be used to
        check that thread calling this function is "owner" of this block
    ------------------------------------------------------------
    revno: 3362.121.62
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Mon 2011-05-16 13:44:52 +0200
    message:
      ndb - change mt-asm.h
        not to emit #error if unsupported platform encountered
        and to #define NDB_HAVE_ for each function supported
------------------------------------------------------------
revno: 4197
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Mon 2011-05-16 15:32:56 -0700
message:
  Add support for BETWEEN and NOT BETWEEN in clusterj-jdbc
------------------------------------------------------------
revno: 4196 [merge]
committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
branch nick: 7.1
timestamp: Mon 2011-05-16 12:21:23 +0200
message:
  Merge 7.0 -> 7.1
    ------------------------------------------------------------
    revno: 3362.121.61 [merge]
    committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
    branch nick: 7.0
    timestamp: Mon 2011-05-16 12:02:42 +0200
    message:
      Merge 6.3 -> 7.0
        ------------------------------------------------------------
        revno: 2585.180.44
        committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
        branch nick: 6.3
        timestamp: Mon 2011-05-16 11:59:05 +0200
        message:
          ndb
           - add patch to mtr.pl which print out ndbd and ndb_mgmd log files
             when mtr.pl detect that cluster has failed to start
    ------------------------------------------------------------
    revno: 3362.121.60 [merge]
    committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
    branch nick: 7.0
    timestamp: Mon 2011-05-16 11:14:52 +0200
    message:
      Null merge
        ------------------------------------------------------------
        revno: 2585.180.43
        committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
        branch nick: 6.3
        timestamp: Mon 2011-05-16 11:11:50 +0200
        message:
          ndb
          - hack mtr.pl in 6.3 so ignore --suite=*ndb_rpl* to make it easier for our
          automated build systems
------------------------------------------------------------
revno: 4195 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Mon 2011-05-16 10:57:55 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.121.59
    committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
    branch nick: 7.0
    timestamp: Mon 2011-05-16 09:20:54 +0200
    message:
      Add ndb_rpl/ to Makefile.am
    ------------------------------------------------------------
    revno: 3362.121.58 [merge]
    committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
    branch nick: 7.0
    timestamp: Mon 2011-05-16 08:50:14 +0200
    message:
      Merge in split rpl_ndb
        ------------------------------------------------------------
        revno: 3362.132.1
        committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
        branch nick: 7.0-split-rpl_ndb
        timestamp: Fri 2011-05-13 09:40:50 +0200
        message:
          ndb
            - move all replication tests that are unique to ndb into ndb_rpl and
              keep only the tests that source from extra/rpl_tests/ still in rpl_ndb
------------------------------------------------------------
revno: 4194 [merge]
committer: jonas oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Fri 2011-05-13 15:22:49 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.121.57
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Fri 2011-05-13 13:42:59 +0200
    message:
      ndb - add "manual" timeout on 600s to ndb_alter_table_online2 in order to try to track down spurious 900s timeout reported by mtr
    ------------------------------------------------------------
    revno: 3362.121.56
    committer: Ole John Aske <ole.john.aske@oracle.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Fri 2011-05-13 10:38:01 +0200
    message:
      Fixed a problem in SPJ block with 'bushy index scans' where condition
      for when to release or keep buffered rows and/or rangekeys 
      was incorrect.
    ------------------------------------------------------------
    revno: 3362.121.55 [merge]
    committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Thu 2011-05-12 16:17:44 +0200
    message:
      Merge
        ------------------------------------------------------------
        revno: 3362.131.2
        committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
        branch nick: 7.0
        timestamp: Thu 2011-05-12 14:53:51 +0200
        message:
          ndb
           - add same define for INADDR_NONE as in include/my_net.h to avoid
            problem compiling NdbTCP.cpp if INADDR_NONE define is removed.
           - this hack should do until code does not use INADDR_NONE anymore
        ------------------------------------------------------------
        revno: 3362.131.1 [merge]
        committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
        branch nick: mysql-5.1-telco-7.0
        timestamp: Thu 2011-05-12 12:06:15 +0200
        message:
          Merge
            ------------------------------------------------------------
            revno: 3362.130.1
            committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
            branch nick: 7.0
            timestamp: Thu 2011-05-12 11:52:16 +0200
            message:
              ndb
               - add suppression for the LOST_EVENTS error message that this test produces
                in slave's error.log(the global suppression is removed in future version)
    ------------------------------------------------------------
    revno: 3362.121.54
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0
    timestamp: Thu 2011-05-12 16:13:43 +0200
    message:
      ndb
       - add a few lines at end of top level CMakeLists.txt to dump the contents of cmake's
        output and error(ie config.log) to stdout
    ------------------------------------------------------------
    revno: 3362.121.53
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Thu 2011-05-12 13:31:21 +0200
    message:
      ndb - use new information_schema.partitions support to really verify that fragment count changes
------------------------------------------------------------
revno: 4193
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Thu 2011-05-12 15:12:30 -0700
message:
  Improve clusterj test: remove all rows after test
------------------------------------------------------------
revno: 4192
committer: John David Duncan <john.duncan@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Thu 2011-05-12 13:06:27 -0700
message:
  More improved mtr include tests for clusterj
------------------------------------------------------------
revno: 4191
committer: John David Duncan <john.duncan@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Thu 2011-05-12 09:04:16 -0700
message:
  Smarter test for junit jar file.
------------------------------------------------------------
revno: 4190 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Thu 2011-05-12 11:40:20 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.121.52
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Thu 2011-05-12 11:26:38 +0200
    message:
      ndb - bug#61147 - fix stop of other ndb_mgmd incorrectly reporting failure
    ------------------------------------------------------------
    revno: 3362.121.51
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Thu 2011-05-12 11:01:21 +0200
    message:
      ndb - bug#60484 - also rename blob tables when changing db/schema
    ------------------------------------------------------------
    revno: 3362.121.50
    committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
    branch nick: 7.0
    timestamp: Wed 2011-05-11 21:12:56 +0200
    message:
      ndb
       - fix NdbGetInAddr-t to allow also EAI_NONAME to skip testing using that address 
       - improve printouts
    ------------------------------------------------------------
    revno: 3362.121.49 [merge]
    committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Wed 2011-05-11 16:31:11 +0200
    message:
      Merge
        ------------------------------------------------------------
        revno: 3362.129.3
        committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
        branch nick: 7.0
        timestamp: Wed 2011-05-11 16:26:37 +0200
        message:
          ndb - fix spelling error and printout
        ------------------------------------------------------------
        revno: 3362.129.2
        committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
        branch nick: 7.0
        timestamp: Wed 2011-05-11 16:23:40 +0200
        message:
          ndb
           - check if the hostname from gethostname() and also "localhost" can
             be resolved before running the Nbd_getInAddr tests with them.
        ------------------------------------------------------------
        revno: 3362.129.1
        committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
        branch nick: 7.0
        timestamp: Wed 2011-05-11 15:54:35 +0200
        message:
          ndb - fix warning about missing parameter
    ------------------------------------------------------------
    revno: 3362.121.48
    committer: Ole John Aske <ole.john.aske@oracle.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Wed 2011-05-11 15:31:44 +0200
    message:
      Remove unused field & methods fron 'class NdbReceiver'
      
      1. Method NdbReceiver::copyout() is unused -> remove
      2. Struct m_recattr is unused after removal of ::copyout() -> remove
      3. Field m_record::m_column_count is unused ->remove
      4. Union enclosing m_recattr & m_record only contains m_record after '3.' -> remove
      5. Remove argument 'column_count' from ::do_setup_ndbrecord() is it
         was used to set the obsolete 'm_record::m_column_count'.
    ------------------------------------------------------------
    revno: 3362.121.47 [merge]
    committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
    branch nick: 7.0
    timestamp: Wed 2011-05-11 14:44:06 +0200
    message:
      Merge in patch for bug 12542120
        ------------------------------------------------------------
        revno: 3362.128.1
        committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
        branch nick: 7.0-addrinfo
        timestamp: Wed 2011-05-11 14:23:24 +0200
        message:
          Bug#12542120 - rewrite ndb_getinaddr to use getaddrinfo
           - change Ndb_getInAddr to use 'getaddrinfo' to convert the address
             string into a IPv4 inaddr
           - add NdbGetInAddr-t unit test
------------------------------------------------------------
revno: 4189
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Wed 2011-05-11 17:09:43 -0700
message:
  Fix bit(64) column types on big endian architectures
------------------------------------------------------------
revno: 4188
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Tue 2011-05-10 12:33:25 -0700
message:
  Fix autocommit delete by query
------------------------------------------------------------
revno: 4187
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Mon 2011-05-09 22:15:12 -0700
message:
  Temporarily disable new delete by query tests
------------------------------------------------------------
revno: 4186
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Mon 2011-05-09 18:45:11 -0700
message:
  Remove compiler warnings from AllTests
------------------------------------------------------------
revno: 4185
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Mon 2011-05-09 18:19:27 -0700
message:
  Support autotransaction for delete by query
------------------------------------------------------------
revno: 4184
committer: Craig L Russell <Craig.Russell@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Mon 2011-05-09 18:04:17 -0700
message:
  Update */pom.xml to 7.1.14
------------------------------------------------------------
revno: 4183
committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
branch nick: 7.1
timestamp: Mon 2011-05-09 16:01:14 +0200
message:
  ndb
   - readd settings to storage/ndb/CMakeLists.txt which
    has dissapeared during merge-
   - The missing pieces caused:
   - - different compiler flags for debug build in ha_ndbcluster
     compared to what had been used in MySQL Server. Thus causing
    an assert when freeing memory in ha_ndbcluster which had been allocated
    by server code. Affected debug builds.
   -- the removal of -Werror was not done. Did not affect Windows, only Linux
     which is not supported with cmake for 5.1
------------------------------------------------------------
revno: 4182 [merge]
committer: jonas oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Sat 2011-05-07 12:50:14 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.121.46
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Sat 2011-05-07 08:17:02 +0200
    message:
      ndb - bug#56051 - remove known 899 case...reclassify 899 as internal error (instead of temporary)
    ------------------------------------------------------------
    revno: 3362.121.45
    committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
    branch nick: 7.0
    timestamp: Fri 2011-05-06 20:01:43 +0200
    message:
      ndb - adapt Makefile.am to new location of suite/ndb files
    ------------------------------------------------------------
    revno: 3362.121.44
    committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
    branch nick: 7.0
    timestamp: Fri 2011-05-06 16:11:46 +0200
    message:
      ndb
       - move saved backups to a shorter path so that also tar
         from last century can unpack them
         i.e suite/ndb/std_data/ndb_backup* -> suite/ndb/backups/*
    ------------------------------------------------------------
    revno: 3362.121.43
    committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
    branch nick: 7.0
    timestamp: Fri 2011-05-06 15:48:00 +0200
    message:
      Move data files from ndb/std_data to ndb/data
    ------------------------------------------------------------
    revno: 3362.121.42
    committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
    branch nick: 7.0
    timestamp: Fri 2011-05-06 15:40:42 +0200
    message:
      ndb - remove test cases which could not be run by mtr.pl
    ------------------------------------------------------------
    revno: 3362.121.41
    committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
    branch nick: 7.0
    timestamp: Fri 2011-05-06 15:26:05 +0200
    message:
      ndb
       - change ndbcluster to be a DEFAULT plugin and not MANDATORY,
         since mandatory does not give a --ndbcluster switch.
------------------------------------------------------------
revno: 4181 [merge]
committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
branch nick: 7.1
timestamp: Fri 2011-05-06 14:19:04 +0200
message:
  Merge 7.0 -> 7.1
    ------------------------------------------------------------
    revno: 3362.121.40 [merge]
    committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
    branch nick: 7.0
    timestamp: Fri 2011-05-06 11:46:09 +0200
    message:
      Merge
        ------------------------------------------------------------
        revno: 3362.127.2
        committer: Magnus Bl?udd <magnus.blaudd@sun.com>
        branch nick: 7.0
        timestamp: Tue 2011-05-03 11:37:35 +0200
        message:
          ndb
           - set NDB to be a mandatory plugin in MySQL Cluster and not default in vanilla MySQL Server
        ------------------------------------------------------------
        revno: 3362.127.1
        committer: Magnus Bl?udd <magnus.blaudd@sun.com>
        branch nick: 7.0
        timestamp: Tue 2011-05-03 11:20:34 +0200
        message:
          ndb
           - add cmake checks to detect if this is a MySQL Cluster build ie. the MySQL version string ends in -ndb-Y.Y.Y[-status]
           - ad sanity check to make sure that the MySQL Cluster version(if any) matches the NDB version
    ------------------------------------------------------------
    revno: 3362.121.39
    committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
    branch nick: 7.0
    timestamp: Fri 2011-05-06 10:05:58 +0200
    message:
      Merge cherry pick of bug 12433999 from 5.1-mtr
    ------------------------------------------------------------
    revno: 3362.121.38
    committer: Ole John Aske <ole.john.aske@oracle.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Thu 2011-05-05 13:06:08 +0200
    message:
      Refactoring / cleanup of SPJ API after http://lists.mysql.com/commits/136639
      (Which allows pushed scan childs to be 'bushy')
      
      The NdbQueryBuilder used to keep track of whether a pushed operation 
      already had a scan descendant - Mainly in order to be able to throw
      an error of a bushy scan join was constructed.
      
      The only usage of ::hasScanDescendant() besides this was within
      NdbQueryImpl::sendFetchMore(). It used it for calculating
      which ResultStreams to ::reset() as they would receive new rows.
      It turned out that this code was overly complicated, and could be 
      simplified - which removed the need for the 'scan descendant' knowledge.
      
      ::markScanAncestors(), ::hasScanDescendant() has then become 
      obsolete and is therefore removed by this patch.
    ------------------------------------------------------------
    revno: 3362.121.37
    committer: Ole John Aske <ole.john.aske@oracle.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Thu 2011-05-05 09:43:12 +0200
    message:
      Small refactoring of NdbQueryBuilder's construction of pushed operations (SPJ API)
      Partly a followup to: mysql.com/commits/135407
      
      To simplify error handling code when building NdbQueryOperationDef's, the allocated
      operation is added to NdbQueryBuilders'Vector<NdbQueryOperationDefImpl*> m_operations'
      earlier. In case of a failure during query build, the operation will then be 
      released together with all other resources allocated so far through this NdbQueryBuilder.
      
      This removed the need for manually delete the allocated operation in case of failures.
    ------------------------------------------------------------
    revno: 3362.121.36
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2011-05-04 15:00:44 +0200
    message:
      ndb - add --no-defaults to 2 --exec's which would otherwise fail mysteriously if having non-default environment (found by having non standard environment by misstake)
    ------------------------------------------------------------
    revno: 3362.121.35
    committer: Ole John Aske <ole.john.aske@oracle.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Wed 2011-05-04 13:45:33 +0200
    message:
      Extended SPJ block with the result mode 'NI_REPEAT_SCAN_RESULT' which will
      enable us to also push bushy-scan operation (or 'star-join') when integrated
      with mysqld.
      
      This mode comes in addition as an alternative to the already existing way
      of handling pushed queries with multiple child scans.
      
      - Currently new result rows from all child scans related to the same parent 
        operation is returned simultaneously when fetching more scan rows.
        In order for mysqld to produce joined results from these rows, it has
        to buffer all rows from the other scans currently not being iterated 
        in the nested loop join algorith. As #rows returned might be (almost) 
        infinite this was not possible to integrate with mysqld, and has currently
        forced us to enforce an artificial parent dependencies between bushy-scans.
        This had the side effect that cross joined results was materialized on
        the SPJ nodes, and lots of redundant result rows had to be returned.
      
      - The new 'NI_REPEAT_SCAN_RESULT' aims at reducing these redundant rows.
        It moves X-join granularity from 'repeat rows' (as above) to
       'repeat batches' such that: If multiple batches from bushy scans has 
        remaining rows, a sequence of NEXTREQ's will fill new rows into *one* of
        batch buffers, while the other scan batches will be filled with 
        rows which are repeated from the the previous fetches. 
        The combination of these batched rows will be unique, and returned
        such that if the client iterates all current rows in the batched it
        will form the full crossproduct of the start-joined scans.
    ------------------------------------------------------------
    revno: 3362.121.34
    committer: Jan Wedvik <jan.wedvik@sun.com>
    branch nick: main-obj-map
    timestamp: Wed 2011-05-04 11:35:08 +0200
    message:
      This commit makes the following changes to NdbObjectIdMap:
      
      1. It puts unmapped objects at the end of the free list instead of at the front.
      This postpones reuse of object ids as long as possible, and thus minimizes 
      the chance of sending a late arriving message to the wrong recipient.
      
      2. It removes a redundant mutex (the class was not thread safe anyway).
      
      3. It refactors the code a bit, hopefully making it more readable.
------------------------------------------------------------
revno: 4180 [merge]
committer: jonas oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Wed 2011-05-04 07:24:02 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.121.33
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Tue 2011-05-03 22:40:59 +0200
    message:
      ndb - try to make rpl_ndb_ui2 stable
    ------------------------------------------------------------
    revno: 3362.121.32
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Tue 2011-05-03 15:48:54 +0200
    message:
      ndb - fix upgrade with deferred constraints
    ------------------------------------------------------------
    revno: 3362.121.31
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Tue 2011-05-03 08:21:59 +0200
    message:
      ndb - increase timeout for DeferredMixedLoadError
    ------------------------------------------------------------
    revno: 3362.121.30
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Mon 2011-05-02 15:36:19 +0200
    message:
      ndb - bug#61025 - fix race condition between CONNECT_REP and CM_REGREQ in QMGR (ndbmtd)
------------------------------------------------------------
revno: 4179 [merge]
committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
branch nick: 7.1
timestamp: Fri 2011-04-29 13:47:40 +0200
message:
  Merge 7.0 -> 7.1
    ------------------------------------------------------------
    revno: 3362.121.29 [merge]
    committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Fri 2011-04-29 13:45:56 +0200
    message:
      Merge
        ------------------------------------------------------------
        revno: 3362.126.8
        committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
        branch nick: 7.0
        timestamp: Fri 2011-04-29 11:06:21 +0200
        message:
          ndb
           - mark ha_ndbcluster::eventSetAnyyValue as const
        ------------------------------------------------------------
        revno: 3362.126.7
        committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
        branch nick: 7.0
        timestamp: Wed 2011-04-27 10:22:04 +0200
        message:
          rpl_ndb
           - rename rpl_ndb_extraColMaster to rpl_ndb_extra_col_master
        ------------------------------------------------------------
        revno: 3362.126.6
        committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
        branch nick: 7.0
        timestamp: Wed 2011-04-27 10:14:37 +0200
        message:
          rpl_ndb
           - rename rpl_ndb_extraCol to rpl_ndb_extra_col_slave
           - only run with binlog-format=row
        ------------------------------------------------------------
        revno: 3362.126.5
        committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
        branch nick: 7.0
        timestamp: Wed 2011-04-27 09:59:12 +0200
        message:
          rpl_ndb
            - only run rpl_ndb_insert_ignore with binlog-format=row since included test
             does not support another format with engine = NDB
           - remove assignement of $engine_type2 which is not used by included .test
        ------------------------------------------------------------
        revno: 3362.126.4
        committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
        branch nick: 7.0
        timestamp: Wed 2011-04-27 08:52:34 +0200
        message:
          ndb
           - remove cluster specific hack in mtr.pl which alloweed running
             with --binlog-format specified although no binloging on a specific mysqld
        ------------------------------------------------------------
        revno: 3362.126.3
        committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
        branch nick: 7.0
        timestamp: Wed 2011-04-27 08:51:30 +0200
        message:
          rpl_ndb
           - remove combinations file for rpl_ndb, if a test need to
             test different binlog-formats it can switch to that mode
             in the test
        ------------------------------------------------------------
        revno: 3362.126.2
        committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
        branch nick: 7.0
        timestamp: Wed 2011-04-27 08:29:23 +0200
        message:
          rpl_ndb
           - change rpl_ndb_slave_lsu* to use new rpl scripts
           - update .result files
        ------------------------------------------------------------
        revno: 3362.126.1
        committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
        branch nick: 7.0
        timestamp: Tue 2011-04-26 16:48:26 +0200
        message:
          rpl_ndb
           - remove master and slave connection and use the srv_master and srv_slave
             connections instead
------------------------------------------------------------
revno: 4178 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Fri 2011-04-29 13:36:28 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.121.28
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Fri 2011-04-29 11:11:12 +0200
    message:
      ndb - fix incorrect assertion (although harmless) in Dbspj. Update comments around it
    ------------------------------------------------------------
    revno: 3362.121.27
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Fri 2011-04-29 10:44:38 +0200
    message:
      ndb - fix a spj node-failure case, which broke with recent change to abort handling
    ------------------------------------------------------------
    revno: 3362.121.26
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Thu 2011-04-28 14:07:13 +0200
    message:
      ndb - bug#11793592 - change error message for 1302-"Out of backup records" to "A backup is already running"
    ------------------------------------------------------------
    revno: 3362.121.25
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Thu 2011-04-28 14:04:11 +0200
    message:
      ndb - adopt fire-trig-conf to multi-tc
------------------------------------------------------------
revno: 4177
committer: John David Duncan <john.duncan@oracle.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Thu 2011-04-28 16:14:15 -0700
message:
  Allow JTie (and ClusterJ) to build on FreeBSD
------------------------------------------------------------
revno: 4176 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Thu 2011-04-28 11:42:34 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.121.24
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Thu 2011-04-28 09:47:53 +0200
    message:
      ndb - bug#47952 - fix unique index + replication problem by implmenting deferred unique index maintainance
    ------------------------------------------------------------
    revno: 3362.121.23 [merge]
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2011-04-27 23:13:10 +0200
    message:
      ndb - merge first parts of wl4163
        ------------------------------------------------------------
        revno: 3362.125.18
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Mon 2011-04-25 19:46:59 +0300
        message:
          wl#4163 d06_ops.diff
          common search-to-scan ascending/descending
        ------------------------------------------------------------
        revno: 3362.125.17
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Mon 2011-04-25 19:43:40 +0300
        message:
          wl#4163 d05_ops.diff
          search-within-node in search-to-scan
        ------------------------------------------------------------
        revno: 3362.125.16
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Mon 2011-04-25 19:41:11 +0300
        message:
          wl#4163 d04_ops.diff
          search-down-tree in search-to-scan
        ------------------------------------------------------------
        revno: 3362.125.15
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Mon 2011-04-25 19:20:13 +0300
        message:
          wl#4163 d03_ops.diff
          remove a special case in search-to-scan descending
        ------------------------------------------------------------
        revno: 3362.125.14
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Mon 2011-04-25 19:19:32 +0300
        message:
          wl#4163 d02_ops.diff
          remove a special case in search-to-scan ascending
        ------------------------------------------------------------
        revno: 3362.125.13
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Mon 2011-04-25 18:57:28 +0300
        message:
          wl#4163 d01_ops.diff
          remove use of bottom node in search-to-scan
        ------------------------------------------------------------
        revno: 3362.125.12
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Mon 2011-04-25 17:50:33 +0300
        message:
          wl#4163 c04_ops.diff
          search-within-node in search-to-update
        ------------------------------------------------------------
        revno: 3362.125.11
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Mon 2011-04-25 17:48:10 +0300
        message:
          wl#4163 c03_ops.diff
          search-down-tree for seach-to-update
        ------------------------------------------------------------
        revno: 3362.125.10
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Mon 2011-04-25 17:42:38 +0300
        message:
          wl#4163 c02_ops.diff
          add ctx arg to search-to-remove
        ------------------------------------------------------------
        revno: 3362.125.9
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Mon 2011-04-25 17:15:19 +0300
        message:
          wl#4163 c01_ops.diff
          remove use of bottom node in search-to-add
        ------------------------------------------------------------
        revno: 3362.125.8
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Sun 2011-04-24 19:20:23 +0300
        message:
          wl#4163 b04_maxent.diff
          move max entry from node head to node end
        ------------------------------------------------------------
        revno: 3362.125.7
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Sun 2011-04-24 19:12:04 +0300
        message:
          wl#4163 b03_minmax.diff
          remove pointless method getMinMax()
        ------------------------------------------------------------
        revno: 3362.125.6
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Sun 2011-04-24 18:39:54 +0300
        message:
          wl#4163 b02_accsize.diff
          remove obsolete enum AccSize
        ------------------------------------------------------------
        revno: 3362.125.5
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Sun 2011-04-24 16:10:50 +0300
        message:
          wl#4163 b01_findfrg.diff
          common findFrag()
        ------------------------------------------------------------
        revno: 3362.125.4 [merge]
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Sun 2011-04-24 10:17:35 +0300
        message:
          merge to wl4163
        ------------------------------------------------------------
        revno: 3362.125.3 [merge]
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Fri 2011-04-22 21:09:19 +0300
        message:
          merge to wl4163
        ------------------------------------------------------------
        revno: 3362.125.2 [merge]
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Wed 2011-04-20 17:36:29 +0300
        message:
          merge
        ------------------------------------------------------------
        revno: 3362.125.1
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-wl4163-70
        timestamp: Wed 2011-04-20 17:13:21 +0300
        message:
          tree_name
    ------------------------------------------------------------
    revno: 3362.121.22
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2011-04-27 13:34:19 +0200
    message:
      ndb - fix 0-len key (fails on my new brillant assert in ACC)
    ------------------------------------------------------------
    revno: 3362.121.21 [merge]
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2011-04-27 12:49:51 +0200
    message:
      ndb - merge 63 to 70
        ------------------------------------------------------------
        revno: 2585.180.42 [merge]
        committer: Jonas Oreland <jonas@mysql.com>
        branch nick: telco-6.3
        timestamp: Wed 2011-04-27 11:46:21 +0200
        message:
          ndb - merge 62 to 63
            ------------------------------------------------------------
            revno: 2572.88.1
            committer: Jonas Oreland <jonas@mysql.com>
            branch nick: telco-6.2
            timestamp: Wed 2011-04-27 11:34:05 +0200
            message:
              ndb - remove storage/ndb/test/sql from 6.2
    ------------------------------------------------------------
    revno: 3362.121.20
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2011-04-27 12:48:16 +0200
    message:
      ndb - add more of mt-tc code
    ------------------------------------------------------------
    revno: 3362.121.19
    committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
    branch nick: 7.0
    timestamp: Tue 2011-04-26 15:48:44 +0200
    message:
      rpl_ndb
       - convert rpl_ndb_break_3_chain to use the new rpl scripts
       - remove unused config options from .cnf file to simplify it further
       - update .result file to new rpl script output
    ------------------------------------------------------------
    revno: 3362.121.18
    committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
    branch nick: 7.0
    timestamp: Tue 2011-04-26 11:28:41 +0200
    message:
      rpl_ndb
       - Configure slave mysqld without innodb, and set myisam
         as default storage engine(since innodb will be default
         otherwise starting from 5.5)
------------------------------------------------------------
revno: 4175 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Tue 2011-04-26 09:40:28 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.121.17 [merge]
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Tue 2011-04-26 09:39:21 +0200
    message:
      ndb - merge 63 to 70
        ------------------------------------------------------------
        revno: 2585.180.41
        committer: Jonas Oreland <jonas@mysql.com>
        branch nick: telco-6.3
        timestamp: Tue 2011-04-26 09:25:13 +0200
        message:
          ndb - bump version to 6.3.44
    ------------------------------------------------------------
    revno: 3362.121.16
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Tue 2011-04-26 09:25:51 +0200
    message:
      ndb - bump version to 7.0.25
------------------------------------------------------------
revno: 4174
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Tue 2011-04-26 09:26:32 +0200
message:
  ndb - bump version to 7.1.14
------------------------------------------------------------
revno: 4173 [merge]
tags: clone-mysql-5.1.56-ndb-7.1.13-src-build
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Tue 2011-04-26 09:14:45 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.121.15 [merge]
    tags: clone-mysql-5.1.56-ndb-7.0.24-src-build
    committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Tue 2011-04-26 07:23:11 +0200
    message:
      Merge
        ------------------------------------------------------------
        revno: 3362.124.7
        committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
        branch nick: 7.0
        timestamp: Thu 2011-04-21 14:36:25 +0200
        message:
          rpl_ndb
           - rpl_ndb_typeconv* requires binlog_format row
           - refactor rpl_ndb_typeconv* to use an include file which shows only
            those conversions with unexpected results, thus eliminating
             the need to record a new result file when the source .test file 
            from extra/rpl_tests changes.
        ------------------------------------------------------------
        revno: 3362.124.6
        committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
        branch nick: 7.0
        timestamp: Thu 2011-04-21 09:58:07 +0200
        message:
          rpl_ndb
           - rpl_ndb_typeconv* can only run with row format(backport from 5.5)
        ------------------------------------------------------------
        revno: 3362.124.5
        committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
        branch nick: 7.0
        timestamp: Thu 2011-04-21 09:53:16 +0200
        message:
          rpl_ndb
           - add combinations file to make rpl_ndb run all tests with
             both mixed and row format
        ------------------------------------------------------------
        revno: 3362.124.4
        committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
        branch nick: 7.0
        timestamp: Wed 2011-04-20 16:36:44 +0200
        message:
          rpl_ndb
           - fix problem with testcase which didn't set which storage_engine
             to use for slave until _after_ slave thread had been started nor did
            it set it global. This caused the slave to run with the default setting
            for storage_engine and thus creating the tables on slave with
            engine=MyISAM in 5.1 and enging=InnoDB in 5.5.
           - updated .result file
        ------------------------------------------------------------
        revno: 3362.124.3
        committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
        branch nick: 7.0
        timestamp: Wed 2011-04-20 14:50:50 +0200
        message:
          ndb
           - mark up patch for BUG 12380149 with MCP tags
        ------------------------------------------------------------
        revno: 3362.124.2
        committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
        branch nick: 7.0
        timestamp: Wed 2011-04-20 14:10:50 +0200
        message:
          rpl_ndb
                 - move rpl_ndb_2multi_basic.test from common location for all rpl tests
                  to rpl_ndb suite which is the olny place it's used.
                 - rename file ending to .inc and update all .test files which is using it.
        ------------------------------------------------------------
        revno: 3362.124.1
        committer: Magnus Bl?udd <magnus.blaudd@oracle.com>
        branch nick: 7.0
        timestamp: Wed 2011-04-20 13:50:29 +0200
        message:
          rpl_ndb
           - move rpl_ndb_2multi_eng.test from common location for all rpl tests
            to rpl_ndb suite which is the olny place it's used.
           - rename file ending to .inc and update all .test files which is using it.
    ------------------------------------------------------------
    revno: 3362.121.14
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Sat 2011-04-23 10:21:36 +0200
    message:
      ndb - fix end test drop table in CreateAndDropAtRandom and friends
