Commit a2bf4dc3 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
parents ed744fa0 90f0161e

ndb/src/kernel/blocks/grep/Grep.cpp

+8 −0
Original line number Diff line number Diff line
@@ -619,6 +619,12 @@ Grep::PSCoord::execCREATE_SUBID_REF(Signal* signal) { 
  {

    jam();

    err = GrepError::SUBSCRIPTION_ID_SUMA_FAILED_CREATE;

  } else {

    jam();

    ndbrequire(false); /* Added since errorcode err unhandled

			* TODO: fix correct errorcode

			*/

    err= GrepError::NO_ERROR; // remove compiler warning

  }



  SubCoordinatorPtr subPtr;
@@ -1819,6 +1825,7 @@ Grep::PSCoord::sendRefToSS(Signal * signal, 
    break;

  default:

    ndbrequire(false);

    event= GrepEvent::Rep_Disconnect; // remove compiler warning

  }  

  /**

   * Finally, send an event.
@@ -1906,6 +1913,7 @@ Grep::PSPart::sendRefToPSCoord(Signal * signal, 
    break;

  default:

    ndbrequire(false);

    event= GrepEvent::Rep_Disconnect; // remove compiler warning

  }

  

  /**

ndb/src/kernel/vm/Emulator.cpp

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ NdbShutdown(NdbShutdownType type, 
      break;

    default:

      ndbout << "Error handler " << shutting << " system"

	     << " (unknown type: " << type << ")" << endl;

	     << " (unknown type: " << (unsigned)type << ")" << endl;

      type = NST_ErrorHandler;

      break;

    }