diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2015-12-04 22:38:16 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-12-04 22:38:16 +0100 |
| commit | 27f9d2f9291efaca2a96fbda1c68e410abd94767 (patch) | |
| tree | 2f4f53d612a0cd9f17b94287327cb319437f9d7e /storage/connect/plugutil.c | |
| parent | dc8a0df0a2c72a974c7e76eb8a3f945e6eed4f15 (diff) | |
| download | mariadb-git-27f9d2f9291efaca2a96fbda1c68e410abd94767.tar.gz | |
Commit updating CONNECT from the 10.1 version
Diffstat (limited to 'storage/connect/plugutil.c')
| -rw-r--r-- | storage/connect/plugutil.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/connect/plugutil.c b/storage/connect/plugutil.c index c0e249adf12..38e28a171b2 100644 --- a/storage/connect/plugutil.c +++ b/storage/connect/plugutil.c @@ -143,7 +143,7 @@ PGLOBAL PlugInit(LPCSTR Language, uint worksize) fprintf(stderr, MSG(GLOBAL_ERROR), (int)sizeof(GLOBAL)); return NULL; } else { - g->Sarea_Size = worksize; + g->Sarea = NULL; g->Createas = 0; g->Alchecked = 0; g->Mrr = 0; @@ -155,7 +155,7 @@ PGLOBAL PlugInit(LPCSTR Language, uint worksize) /*******************************************************************/ /* Allocate the main work segment. */ /*******************************************************************/ - if (!(g->Sarea = PlugAllocMem(g, worksize))) { + if (worksize && !(g->Sarea = PlugAllocMem(g, worksize))) { char errmsg[256]; sprintf(errmsg, MSG(WORK_AREA), g->Message); strcpy(g->Message, errmsg); @@ -163,7 +163,7 @@ PGLOBAL PlugInit(LPCSTR Language, uint worksize) } else g->Sarea_Size = worksize; - } /* endif g */ + } /* endif g */ g->jump_level = -1; /* New setting to allow recursive call of Plug */ return(g); |