hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release-1.0beta-refresh' of github.com:skysql/MaxScale into release-1.0beta-refresh

Browse Source
This commit is contained in:
Mark Riddoch
2014-09-23 12:04:37 +01:00
parent a71971cf53 3a1fb1e93b
commit 2c0b549b58
8 changed files with 112 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/core/poll.c
View File

@ -667,7 +667,7 @@ DCB *zombies = NULL;
#endif
} /*< for */
no_op = FALSE;
}
} /*< if (nfds > 0) */
process_zombies:
if (thread_data)
{
@ -690,6 +690,8 @@ process_zombies:
thread_data[thread_id].state = THREAD_STOPPED;
}
bitmask_clear(&poll_mask, thread_id);
/** Release mysql thread context */
mysql_thread_end();
return;
}
if (thread_data)
@ -697,8 +699,6 @@ process_zombies:
thread_data[thread_id].state = THREAD_IDLE;
}
} /*< while(1) */
/** Release mysql thread context */
mysql_thread_end();
}
/**