Merge branch 'release-1.2' into develop

Conflicts:
	server/core/adminusers.c
	server/modules/protocol/mysql_client.c
This commit is contained in:
Markus Makela
2015-07-11 17:12:48 +03:00
39 changed files with 250 additions and 119 deletions

View File

@ -19,6 +19,9 @@
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#ifndef _XOPEN_SOURCE
#define _XOPEN_SOURCE 700
#endif
#include <unistd.h>
#include <crypt.h>
#include <users.h>

View File

@ -197,6 +197,7 @@ GWBUF *rval;
rval->gwbuf_info = buf->gwbuf_info;
rval->gwbuf_bufobj = buf->gwbuf_bufobj;
rval->tail = rval;
rval->next = NULL;
CHK_GWBUF(rval);
return rval;
}