From: magnus.blaudd
Date: June 13 2012 6:52pm
Subject: bzr push into mysql-5.1-telco-7.0 branch (magnus.blaudd:4942 to 4943)
List-Archive: http://lists.mysql.com/commits/144234
Message-Id: <20120613185230.27284.149.4943@peek02.se.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4943 magnus.blaudd@stripped	2012-06-13
      ndb
       - add #include of ndb_global.h in ha_ndbcluster.cc to get NDB_ARRAY_SIZE and
       MIN/MAX

    modified:
      sql/ha_ndbcluster.cc
 4942 magnus.blaudd@stripped	2012-06-13 [merge]
      Merge

    renamed:
      mysql-test/include/rpl_multi_engine2.inc => mysql-test/suite/ndb_rpl/t/ndb_rpl_multi_engine2.inc
    modified:
      mysql-test/suite/ndb/r/ndb_alter_table_online.result
      mysql-test/suite/ndb/r/ndb_basic.result
      mysql-test/suite/ndb/t/ndb_alter_table_online.test
      mysql-test/suite/ndb_rpl/r/ndb_rpl_dd_advance.result
      mysql-test/suite/ndb_rpl/t/ndb_rpl_2multi_basic.inc
      mysql-test/suite/ndb_rpl/t/ndb_rpl_dd_advance.test
      sql/ha_ndbcluster.cc
      storage/ndb/include/ndb_version.h.in
      storage/ndb/src/common/util/version.cpp
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2012-06-13 17:40:40 +0000
+++ b/sql/ha_ndbcluster.cc	2012-06-13 18:49:49 +0000
@@ -41,6 +41,7 @@
 
 #include <mysql/plugin.h>
 #include <ndb_version.h>
+#include <ndb_global.h>
 #include "ndb_mi.h"
 #include "ndb_conflict.h"
 #include "ndb_component.h"

No bundle (reason: useless for push emails).