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

Sorting out rebase

Browse Source
This commit is contained in:
Johan Wikman
2017-03-24 11:35:38 +02:00
parent b89cf62d38
commit 64ab48f698
4 changed files with 7 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/core/dcb.cc
View File

@ -139,9 +139,9 @@ void dcb_global_init()
if ((zombies = (DCB**)MXS_CALLOC(nthreads, sizeof(DCB*))) == NULL ||
(all_dcbs = (DCB**)MXS_CALLOC(nthreads, sizeof(DCB*))) == NULL ||
(all_dcbs_lock = (SPINLOCK**)MXS_CALLOC(nthreads, sizeof(SPINLOCK))) == NULL ||
(all_dcbs_lock = (SPINLOCK*)MXS_CALLOC(nthreads, sizeof(SPINLOCK))) == NULL ||
(nzombies = (int*)MXS_CALLOC(nthreads, sizeof(int))) == NULL ||
(fake_events = (fake_event_t*)MXS_CALLOC(nthreads, sizeof(fake_event_t*))) == NULL ||
(fake_events = (fake_event_t**)MXS_CALLOC(nthreads, sizeof(fake_event_t*))) == NULL ||
(fake_event_lock = (SPINLOCK*)MXS_CALLOC(nthreads, sizeof(SPINLOCK))) == NULL)
{
MXS_OOM();
@ -3447,7 +3447,7 @@ static void poll_add_event_to_dcb(DCB* dcb,
GWBUF* buf,
uint32_t ev)
{
fake_event_t *event = MXS_MALLOC(sizeof(*event));
fake_event_t *event = (fake_event_t*)MXS_MALLOC(sizeof(*event));
if (event)
{