bzr commit into mysql-5.1-telco-7.0 branch (jonas:2908) Bug#44294

[Jonas Oreland]

#At file:///home/jonas/src/64-upgrade/ based on revid:jonas@stripped

 2908 Jonas Oreland	2009-04-15
      ndb - bug#44294 - part V
        instantiate enum with explit numbers as they are sent over the wire
        and needs to be stable

    M  storage/ndb/src/mgmsrv/ConfigManager.hpp
=== modified file 'storage/ndb/src/mgmsrv/ConfigManager.hpp'
--- a/storage/ndb/src/mgmsrv/ConfigManager.hpp	2009-03-26 09:11:40 +0000
+++ b/storage/ndb/src/mgmsrv/ConfigManager.hpp	2009-04-15 14:45:05 +0000
@@ -41,11 +41,11 @@ class ConfigManager : public MgmtThread 
 
   struct ConfigChangeState {
     enum States {
-      IDLE,
-      PREPARING,
-      COMITTING,
-      ABORT,
-      ABORTING
+      IDLE = 0,
+      PREPARING = 1,
+      COMITTING = 2,
+      ABORT = 3,
+      ABORTING = 4
     } m_current_state;
 
     ConfigChangeState() :
@@ -57,12 +57,12 @@ class ConfigManager : public MgmtThread 
   void set_config_change_state(ConfigChangeState::States state);
 
   enum ConfigState {
-    CS_UNINITIALIZED,
+    CS_UNINITIALIZED = 0,
 
-    CS_INITIAL,      // Initial config.ini, ie. no config.bin.X found
+    CS_INITIAL = 1,   // Initial config.ini, ie. no config.bin.X found
 
-    CS_CONFIRMED,    // Started and all agreed
-    CS_FORCED        // Forced start
+    CS_CONFIRMED = 2, // Started and all agreed
+    CS_FORCED = 3     // Forced start
   };
 
   ConfigState m_config_state;


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