Commit 6d1bd029 authored by unknown's avatar unknown
Browse files

Fixes

parent 6cc3eee4

storage/ndb/src/common/portlib/NdbThread.c

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ struct NdbThread 




#ifdef NDB_SHM_TRANSPORTER

void NdbThread_set_shm_sigmask(bool block)

void NdbThread_set_shm_sigmask(my_bool block)

{

  DBUG_ENTER("NdbThread_set_shm_sigmask");

  if (g_ndb_shm_signum)
@@ -64,7 +64,7 @@ ndb_thread_wrapper(void* _ss){ 
  {

    DBUG_ENTER("ndb_thread_wrapper");

#ifdef NDB_SHM_TRANSPORTER

    NdbThread_set_shm_sigmask(true);

    NdbThread_set_shm_sigmask(TRUE);

#endif

    {

      void *ret;

storage/ndb/src/common/transporter/TransporterRegistry.cpp

+2 −2
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ TransporterRegistry::createSHMTransporter(TransporterConfiguration *config) { 
     * Make sure to block g_ndb_shm_signum

     *   TransporterRegistry::init is run from "main" thread

     */

    NdbThread_set_shm_sigmask(true);

    NdbThread_set_shm_sigmask(TRUE);

  }



  if(config->shm.signum != g_ndb_shm_signum)
@@ -1487,7 +1487,7 @@ TransporterRegistry::startReceiving() 
    DBUG_PRINT("info",("Install signal handler for signum %d",

		       g_ndb_shm_signum));

    struct sigaction sa;

    NdbThread_set_shm_sigmask(false);

    NdbThread_set_shm_sigmask(FALSE);

    sigemptyset(&sa.sa_mask);

    sa.sa_handler = shm_sig_handler;

    sa.sa_flags = 0;

storage/ndb/src/ndbapi/TransporterFacade.cpp

+3 −3
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ void TransporterFacade::threadMainReceive(void) 
{

  theTransporterRegistry->startReceiving();

#ifdef NDB_SHM_TRANSPORTER

  NdbThread_set_shm_sigmask(true);

  NdbThread_set_shm_sigmask(TRUE);

#endif

  NdbMutex_Lock(theMutexPtr);

  theTransporterRegistry->update_connections();
@@ -1384,7 +1384,7 @@ void PollGuard::wait_for_input(int wait_time) 
        such that we wake up also on interrupts on the shared memory

        interrupt signal.

      */

      NdbThread_set_shm_sigmask(false);

      NdbThread_set_shm_sigmask(FALSE);

#endif

      m_tp->set_poll_owner(m_waiter);

      m_waiter->set_poll_owner(true);
@@ -1417,7 +1417,7 @@ void PollGuard::unlock_and_signal() 
      If shared memory transporters are used we need to reset our sigmask

      since we are no longer the thread to receive interrupts.

    */

    NdbThread_set_shm_sigmask(true);

    NdbThread_set_shm_sigmask(TRUE);

#endif

    m_waiter->set_poll_owner(false);

    t_signal_cond_waiter= m_tp->rem_last_from_cond_wait_queue();