bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4316)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/7.0-bug58758/ based on revid:jonas@stripped

 4316 Magnus Blåudd	2011-04-18
      Fix DBUG crash when setting a CI_ENUM to different value than 0
       - DBUG only code was retrieveing value as string although it was stored
        as int.

    modified:
      storage/ndb/src/mgmsrv/ConfigInfo.cpp
=== modified file 'storage/ndb/src/mgmsrv/ConfigInfo.cpp'
--- a/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2011-04-15 13:52:53 +0000
+++ b/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2011-04-18 08:47:50 +0000
@@ -4155,6 +4155,7 @@ applyDefaultValues(InitConfigFileParser:
       else
       {
         switch (ctx.m_info->getType(ctx.m_currentInfo, name)){
+        case ConfigInfo::CI_ENUM: /* Int internally */
         case ConfigInfo::CI_INT:
         case ConfigInfo::CI_BOOL:{
           Uint32 val = 0;
@@ -4169,7 +4170,6 @@ applyDefaultValues(InitConfigFileParser:
           break;
         }
         case ConfigInfo::CI_BITMASK:
-        case ConfigInfo::CI_ENUM:
         case ConfigInfo::CI_STRING:{
           const char * val;
           require(ctx.m_currentSection->get(name, &val));

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