diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2017-06-11 17:22:56 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2017-06-11 17:22:56 +0200 |
| commit | c51548d6b4234d1b9bf7548125f63c5975f37d35 (patch) | |
| tree | 5aaa9514d62dcaca3a5580dcc8edd6dbdcad1748 /storage/connect/plgdbutl.cpp | |
| parent | f3452fcd844d6477968c3feb982e30612aa34f4d (diff) | |
| download | mariadb-git-c51548d6b4234d1b9bf7548125f63c5975f37d35.tar.gz | |
Fix unhandled exception:
Force type int for ENUMs.
Replace remaining longjmp.
modified: storage/connect/array.cpp
modified: storage/connect/colblk.cpp
modified: storage/connect/connect.cc
modified: storage/connect/filter.cpp
modified: storage/connect/jdbconn.cpp
modified: storage/connect/plgdbutl.cpp
modified: storage/connect/tabdos.cpp
modified: storage/connect/tabvir.cpp
modified: storage/connect/tabxml.cpp
modified: storage/connect/value.cpp
modified: storage/connect/xobject.cpp
Diffstat (limited to 'storage/connect/plgdbutl.cpp')
| -rw-r--r-- | storage/connect/plgdbutl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/plgdbutl.cpp b/storage/connect/plgdbutl.cpp index c02c435baed..8acda9e3992 100644 --- a/storage/connect/plgdbutl.cpp +++ b/storage/connect/plgdbutl.cpp @@ -473,7 +473,7 @@ bool PlugEvalLike(PGLOBAL g, LPCSTR strg, LPCSTR pat, bool ci) tp = g->Message; else if (!(tp = new char[strlen(pat) + strlen(strg) + 2])) { strcpy(g->Message, MSG(NEW_RETURN_NULL)); - throw OP_LIKE; + throw (int)OP_LIKE; } /* endif tp */ sp = tp + strlen(pat) + 1; @@ -484,7 +484,7 @@ bool PlugEvalLike(PGLOBAL g, LPCSTR strg, LPCSTR pat, bool ci) tp = g->Message; /* Use this as temporary work space. */ else if (!(tp = new char[strlen(pat) + 1])) { strcpy(g->Message, MSG(NEW_RETURN_NULL)); - throw OP_LIKE; + throw (int)OP_LIKE; } /* endif tp */ strcpy(tp, pat); /* Make a copy to be worked into */ |