Commit 87319043 authored by unknown's avatar unknown
Browse files

Merge dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug19787 

into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug19787


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  correct error message when illegal configuration changed
parents 3e4b1c56 50f0c7cd

storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp

+7 −1
Original line number Diff line number Diff line
@@ -6699,7 +6699,13 @@ void Dbdih::execCREATE_FRAGMENTATION_REQ(Signal * signal) 
        }

      }

    }

    ndbrequire(count == (2U + (1 + noOfReplicas) * noOfFragments)); 

    if(count != (2U + (1 + noOfReplicas) * noOfFragments)){

        char buf[255];

        BaseString::snprintf(buf, sizeof(buf),

                           "Illegal configuration change: NoOfReplicas."

                           " Can't be applied online ");

        progError(__LINE__, NDBD_EXIT_INVALID_CONFIG, buf);

    }

    

    CreateFragmentationConf * const conf = 

      (CreateFragmentationConf*)signal->getDataPtrSend();