Merge branch '2.1' into develop

This commit is contained in:
Johan Wikman
2017-08-15 10:31:30 +03:00
12 changed files with 24 additions and 24 deletions

View File

@ -933,9 +933,9 @@ serverRowCallback(RESULTSET *set, void *data)
{
int *rowno = (int *)data;
int i = 0;
char *stat, buf[20];
RESULT_ROW *row;
SERVER *server;
char *stat = NULL, buf[20];
RESULT_ROW *row = NULL;
SERVER *server = NULL;
spinlock_acquire(&server_spin);
server = allServers;