bzr commit into mysql-5.1-telco-7.1 branch (frazer.clement:4255)

[Frazer Clement]

#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


Attachment: [text/bzr-bundle] bzr/[e-mail]