From: Frazer Clement
Date: June 29 2011 11:35am
Subject: bzr commit into mysql-5.1-telco-7.1 branch (frazer.clement:4255)
List-Archive: http://lists.mysql.com/commits/140013
Message-Id: <201106291136.p5TBa2k2028930@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1187654718958489273=="

--===============1187654718958489273==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/frazer/bzr/mysql-5.1-telco-7.1-reflect-push/ based on revid:frazer.clement@stripped

 4255 Frazer Clement	2011-06-29
      Another make distcheck fix attempt

    modified:
      sql/ndb_mi.cc
      sql/ndb_mi.h
=== modified file 'sql/ndb_mi.cc'
--- a/sql/ndb_mi.cc	2011-06-28 16:51:51 +0000
+++ b/sql/ndb_mi.cc	2011-06-29 11:35:53 +0000
@@ -15,7 +15,6 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
-#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
 #include "ndb_mi.h"
 #include "my_sys.h"
 #include "hash.h"
@@ -24,9 +23,9 @@
 extern Master_info *active_mi;
 
 
-Uint32 ndb_mi_get_master_server_id()
+uint32 ndb_mi_get_master_server_id()
 {
-  return (Uint32) active_mi->master_id;
+  return (uint32) active_mi->master_id;
 }
 
 const char* ndb_mi_get_group_master_log_name()
@@ -38,39 +37,39 @@ const char* ndb_mi_get_group_master_log_
 #endif
 }
 
-Uint64 ndb_mi_get_group_master_log_pos()
+uint64 ndb_mi_get_group_master_log_pos()
 {
 #if MYSQL_VERSION_ID < 50600
-  return (Uint64) active_mi->rli.group_master_log_pos;
+  return (uint64) active_mi->rli.group_master_log_pos;
 #else
-  return (Uint64) active_mi->rli->get_group_master_log_pos();
+  return (uint64) active_mi->rli->get_group_master_log_pos();
 #endif
 }
 
-Uint64 ndb_mi_get_future_event_relay_log_pos()
+uint64 ndb_mi_get_future_event_relay_log_pos()
 {
 #if MYSQL_VERSION_ID < 50600
-  return (Uint64) active_mi->rli.future_event_relay_log_pos;
+  return (uint64) active_mi->rli.future_event_relay_log_pos;
 #else
-  return (Uint64) active_mi->rli->get_future_event_relay_log_pos();
+  return (uint64) active_mi->rli->get_future_event_relay_log_pos();
 #endif
 }
 
-Uint64 ndb_mi_get_group_relay_log_pos()
+uint64 ndb_mi_get_group_relay_log_pos()
 {
 #if MYSQL_VERSION_ID < 50600
-  return (Uint64) active_mi->rli.group_relay_log_pos;
+  return (uint64) active_mi->rli.group_relay_log_pos;
 #else
-  return (Uint64) active_mi->rli->get_group_relay_log_pos();
+  return (uint64) active_mi->rli->get_group_relay_log_pos();
 #endif
 }
 
-bool ndb_mi_get_ignore_server_id(Uint32 server_id)
+bool ndb_mi_get_ignore_server_id(uint32 server_id)
 {
   return (active_mi->shall_ignore_server_id(server_id) != 0);
 }
 
-Uint32 ndb_mi_get_slave_run_id()
+uint32 ndb_mi_get_slave_run_id()
 {
   return active_mi->rli.slave_run_id;
 }
@@ -79,6 +78,3 @@ bool ndb_mi_get_in_relay_log_statement(R
 {
   return (rli->get_flag(Relay_log_info::IN_STMT) != 0);
 }
-
-// #ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
-#endif

=== modified file 'sql/ndb_mi.h'
--- a/sql/ndb_mi.h	2011-06-28 16:51:51 +0000
+++ b/sql/ndb_mi.h	2011-06-29 11:35:53 +0000
@@ -18,8 +18,7 @@
 #ifndef NDB_MI_H
 #define NDB_MI_H
 
-#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
-#include <ndb_global.h>
+#include <my_global.h>
 
 /*
    This file defines methods for interacting with the
@@ -31,21 +30,18 @@
 /*
   Accessors
 */
-Uint32 ndb_mi_get_master_server_id();
+uint32 ndb_mi_get_master_server_id();
 const char* ndb_mi_get_group_master_log_name();
-Uint64 ndb_mi_get_group_master_log_pos();
-Uint64 ndb_mi_get_future_event_relay_log_pos();
-Uint64 ndb_mi_get_group_relay_log_pos();
-bool ndb_mi_get_ignore_server_id(Uint32 server_id);
-Uint32 ndb_mi_get_slave_run_id();
-
+uint64 ndb_mi_get_group_master_log_pos();
+uint64 ndb_mi_get_future_event_relay_log_pos();
+uint64 ndb_mi_get_group_relay_log_pos();
+bool ndb_mi_get_ignore_server_id(uint32 server_id);
+uint32 ndb_mi_get_slave_run_id();
 
 /*
    Relay log info related functions
 */
 bool ndb_mi_get_in_relay_log_statement(class Relay_log_info* rli);
 
-// #ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
-#endif
 // #ifndef NDB_MI_H
 #endif


--===============1187654718958489273==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
 name="bzr/frazer.clement@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: frazer.clement@stripped\
#   2w3x3ufvgi3gg12x
# target_branch: file:///home/frazer/bzr/mysql-5.1-telco-7.1-reflect-\
#   push/
# testament_sha1: 697aac499486ea28d8802e818f3f55818f6d1998
# timestamp: 2011-06-29 12:35:58 +0100
# base_revision_id: frazer.clement@stripped\
#   rx8bngr59n0ozf1r
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfSrChEAApvfgAAQWGP//38n
uSC////6UAWYq9oKLe3KV22TQEJJRqJ6J5T0M1T1P1TxQ0xGQAGQ000AOYTAJgBMJhNMAAAmTTQM
JEiaE0ymGqeaptTYoB6hoDEABo0I9Uo0NNAGjQGgAA0AGgNlAJJE00GmmkyAJiap6ZRkep6agBkB
tTuwwyLdicP6dpp1DtH71rVou5TpmiMrowrayaMmBkWXStlprgrrpSask5TlLMupSSp9ku8dReNt
tBL5LPshfulhhDc8I0vQ5741OyqCbq4qVs6MudtnmWfbtpT0uFy1n767nAUi2G8DnHIkyjGDBVHR
71wLuAeckQ0HQI0H8TGLCBpeWHuaw1igU2TDAwNqFYA9ZsQjHbIzxQmIpwfVVNuqAlWJRCneT4QN
5apVgtjJmGm7vCpAP15HzKioKZJyAcWzG4gJKi4F0q6jmRyleFQxZqRV6KIfD1VhYgNDDXcYIDwA
iEK/mQ35tt/kDCGAEFEJ+iy/uTkRCZ3oyLxs8juzgWExxngaXm5Gx2Bni28UGuCD0A80nZDUHEKD
5UcFSGYDLffFEyIxgA8C6FTkDnD+aUjxlFp8Y77XAaNtrI2HDGIGZQ5gfQClurWCmaVTeFw/W+xk
/jm+7dv0jCDbFnLCDtIVHtxkpFiOOtEBbkA9P9IA4I5sAsMUUy11E8DF8M1JkByBVosDX3crh9KB
oYHQ4DxxfPGt+VNrnYJmqPAdIzhduFjANxS9WjpkptaD0OHysTFCRlMwsnM7kaaYmOEnATkaySfP
Ax1sc+QXouvzpxdLHGwV8VyhV0kDrdSmilbx9JyTSqWgZmrgSmYkjZmUOfwNHGIvCVst5mGYbTN6
J3ySWCyIlEQ2NEsWMGxYwYT0SibkQ5RkMdlSlCOokDRObGxsb6wmTS5CDsBSmNsfHwULBiAmHii4
5/X1JB7ePifYRngJckvE8sJ5Vo9Q91WyhpXoHrNKwRP7hHnFJajHz8z0L9Yg9PT1zDcj1nS0K5Rv
sLDMdDMOtRu47sN1dJMSrEqtsCV9KkmrAwHk6FO6hPS2YbCIOeK7m8QanD3rkuNe3Bbvz2CDj2Zc
u8rOTzsdTj06MOtC8vR7IHlxwO2zbFm/hfvzOmJLn7NFHb+IKAW/tZ0lELGbEmakmGubCW1owEyW
/uYXK03JK5L4AyIoqgLvLkdsBGW0loWZCJRFZfWE2GUyKXGcUZmFpNSYikapZ+QHOByBecVXjY2N
pd8DgBGs2GhElc06DLwZuosAm9/TYgY8F1EMmTjdmA8F3+QNjiBqYTSZVzJk4oE4suZ0T0JBrse6
lEETYpUprg+sKk10wosPZOgEiJIgiGQWF4SYL/5GJQFZTTjMFcpeYW4iW/pEUlItSWyhBAs8i7oW
RVpbue9K6JzQxqG9gxLqxduzDNUCkowzR12H0YwKyiQNJDYNatmJtowVxNJUR05yh/hLejwL15PT
An3VgfBGHU3AacGGCpR7y7mCjA4BF27AvVhsIsgNqHg5CkkGftmJe8JhAdLEC9LJKnZylDsK1ZF6
XxNteWoC2yocKaHpKvOrksYhMcrHkuKHFoe5x0Kz8LyOiVwm1HRkgcwlBAwwMHqDig7O6ZUlQMtX
xL3dJk0rETCpgrx0CiTF4aN5AUDeHvTCYXKRQCeaRpAN5ilQoGSuFWA9HARWyMQIIdUhy6WAN0Gk
neirmF/xdyRThQkPSrChEA==


--===============1187654718958489273==--