diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2015-12-14 23:45:23 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-12-14 23:45:23 +0100 |
| commit | 11c339f4327c9ff88bfb62e342f45550d3c6140c (patch) | |
| tree | c2a4127a9b7e1ae35b549abb593934a2d0b87c38 /storage/connect/plgdbutl.cpp | |
| parent | 8286b680b22a15e678badfc112831f47467d3dec (diff) | |
| download | mariadb-git-11c339f4327c9ff88bfb62e342f45550d3c6140c.tar.gz | |
- Fix MDEV-9279. Replacing exit(1) in yy_fatal_error by a longjmp.
modified: storage/connect/fmdlex.c
modified: storage/connect/plgdbutl.cpp
Diffstat (limited to 'storage/connect/plgdbutl.cpp')
| -rw-r--r-- | storage/connect/plgdbutl.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/storage/connect/plgdbutl.cpp b/storage/connect/plgdbutl.cpp index 9e236da2d93..1ec1108c639 100644 --- a/storage/connect/plgdbutl.cpp +++ b/storage/connect/plgdbutl.cpp @@ -679,7 +679,8 @@ void PlugConvertConstant(PGLOBAL g, void* & value, short& type) /* non quoted blanks are not included in the output format. */ /***********************************************************************/ PDTP MakeDateFormat(PGLOBAL g, PSZ dfmt, bool in, bool out, int flag) - { +{ + int rc; PDTP pdp = (PDTP)PlugSubAlloc(g, NULL, sizeof(DATPAR)); if (trace) @@ -708,7 +709,7 @@ PDTP MakeDateFormat(PGLOBAL g, PSZ dfmt, bool in, bool out, int flag) pthread_mutex_lock(&parmut); #endif // !__WIN__ #endif // THREAD - /*int rc =*/ fmdflex(pdp); + rc = fmdflex(pdp); #if defined(THREAD) #if defined(__WIN__) LeaveCriticalSection((LPCRITICAL_SECTION)&parsec); @@ -718,9 +719,10 @@ PDTP MakeDateFormat(PGLOBAL g, PSZ dfmt, bool in, bool out, int flag) #endif // THREAD if (trace) - htrc("Done: in=%s out=%s\n", SVP(pdp->InFmt), SVP(pdp->OutFmt)); + htrc("Done: in=%s out=%s rc=%d\n", SVP(pdp->InFmt), SVP(pdp->OutFmt), rc); + return pdp; - } // end of MakeDateFormat +} // end of MakeDateFormat /***********************************************************************/ /* Extract the date from a formatted string according to format. */ |