------------------------------------------------------------
revno: 4958 [merge]
tags: clone-mysql-5.1.63-ndb-7.0.35-src-build
committer: Frazer Clement <frazer.clement@oracle.com>
branch nick: mysql-5.1-telco-7.0
timestamp: Mon 2012-08-13 16:04:51 +0100
message:
  Merge 6.3->7.0
    ------------------------------------------------------------
    revno: 2585.188.6
    tags: clone-mysql-5.1.61-ndb-6.3.49-src-build
    committer: Frazer Clement <frazer.clement@oracle.com>
    branch nick: mysql-5.1-telco-6.3
    timestamp: Mon 2012-08-13 16:00:28 +0100
    message:
      Fix compile failure
------------------------------------------------------------
revno: 4957 [merge]
committer: Frazer Clement <frazer.clement@oracle.com>
branch nick: mysql-5.1-telco-7.0-compile
timestamp: Mon 2012-08-13 14:03:29 +0100
message:
  Merge 6.3->7.0
    ------------------------------------------------------------
    revno: 2585.188.5
    committer: Frazer Clement <frazer.clement@oracle.com>
    branch nick: mysql-5.1-telco-6.3
    timestamp: Mon 2012-08-13 12:03:25 +0100
    message:
      Bug #14389746 INCOMPLETE REDO METADATA RELOAD LEADS TO REDO EXHAUSTION
      
      Fix problem with redo log metadata reload at node or system restart.
      
      The redo metadata reload mechanism is modified to avoid reading invalid
      data.  This avoids later problems when iterating over this metadata. 
      
      A new test program (testRedo) is created, and added to the daily-basic 
      suite.
------------------------------------------------------------
revno: 4956
committer: Mauritz Sundell <mauritz.sundell@oracle.com>
branch nick: mysql-5.1-telco-7.0
timestamp: Thu 2012-07-12 17:39:36 +0200
message:
  ndb - autotest on ndb07 need use default storage engine myisam
------------------------------------------------------------
revno: 4955
committer: magnus.blaudd@oracle.com
branch nick: 7.0
timestamp: Fri 2012-07-06 11:41:37 +0200
message:
  ndb
   - fix typo in new cmake include file, should use CACHE INTERNAL as two words
     instead of CACHE INTERNAL
   - add missing "not" to message saying that file was "not found"
------------------------------------------------------------
revno: 4954 [merge]
committer: magnus.blaudd@oracle.com
branch nick: 7.0
timestamp: Thu 2012-07-05 13:44:45 +0200
message:
  Merge
    ------------------------------------------------------------
    revno: 4951.2.2
    committer: magnus.blaudd@oracle.com
    branch nick: 7.0
    timestamp: Wed 2012-07-04 10:39:36 +0200
    message:
      ndb
       - fix ndb_blob_big to show only the variable where
         text is exactly "max_allowwd_packet"(no prefix or suffix allowed)
       - this is a forward compatibility fix against 5.6 which
         add more variables with "max_allowed_packet" in the name
    ------------------------------------------------------------
    revno: 4951.2.1
    committer: magnus.blaudd@oracle.com
    branch nick: 7.0
    timestamp: Wed 2012-07-04 10:35:27 +0200
    message:
      ndb
       - remove include directive to directory which does not exists
          (this have of course never caused any files to be included
           but build works anyway so it?s safe to remove)
------------------------------------------------------------
revno: 4953 [merge]
committer: magnus.blaudd@oracle.com
branch nick: mysql-5.1-telco-7.0
timestamp: Thu 2012-07-05 13:31:56 +0200
message:
  Merge
    ------------------------------------------------------------
    revno: 4951.1.1
    committer: magnus.blaudd@oracle.com
    branch nick: 7.0
    timestamp: Thu 2012-07-05 13:19:04 +0200
    message:
      WL#6224 Adapt MySQL Cluster to 5.6
       - Make storage/ndb autodetect if include/my_default.h exists and thus need to link
         with new mysys_ssl library
       - Add minimal wrapper around load_defults in ndb_getopt to avoid exposing my_default.h
         "everywhere", two exceptions confirm the rule since those are hardcore users
       - Rename ndb_opts.c to ndb_opt.cpp and mark public functions therein as "extern C"
------------------------------------------------------------
revno: 4952
committer: magnus.blaudd@oracle.com
branch nick: 7.0
timestamp: Thu 2012-07-05 12:52:36 +0200
message:
  ndb - bump version to 7.0.35
------------------------------------------------------------
revno: 4951 [merge]
tags: clone-mysql-5.1.63-ndb-7.0.34-src-build
committer: magnus.blaudd@oracle.com
branch nick: mysql-5.1-telco-7.0
timestamp: Tue 2012-06-26 15:09:11 +0200
message:
  Merge
    ------------------------------------------------------------
    revno: 4949.1.2
    committer: magnus.blaudd@oracle.com
    branch nick: 7.0
    timestamp: Tue 2012-06-26 15:03:52 +0200
    message:
      Bug#11764570: NDB_ERROR_REPORTER ONLY COLLECTS LOGS MATCHING NAME
      NDB_$ID*.
       - Remove 'logger.log' as default filename from FileLogHandler
       - Require filename argument to Logger::createFileHandler() and always
         call FileLogHandler constructor with that name.
       - Move the addHandler function from Logger to MgmtSrvr thus making it
         significantly easier to pass the default cluster log filename for the
         current node to the FileLogHandler constructor.
       - Make ndb_error_reporter parse out filename=xxx from LogDestination
         and try to copy that file(can theoretically be more than one)
         as well from the remote host.
       - Add testcase making sure that ndb_mgmd does not create logger.log anymore
         but instead defaults to ndb_<nodeid>_cluster.log if LogDestination=FILE:
         has been used wiuthout filename= parameter
    ------------------------------------------------------------
    revno: 4949.1.1
    committer: magnus.blaudd@oracle.com
    branch nick: 7.0
    timestamp: Tue 2012-06-26 13:21:25 +0200
    message:
      ndb
       - remove unused functions from LogHandler
