diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2015-02-19 00:59:02 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-02-19 00:59:02 +0100 |
| commit | 564d41faf4938596c7f0bccd56a4f820048dc031 (patch) | |
| tree | 2fdd4c3f366a5d03424b15bc7f51448d0ac6a89b /storage/connect/connect.cc | |
| parent | 2201aa66cf4dccba8ffa354643507c85958e72a0 (diff) | |
| download | mariadb-git-564d41faf4938596c7f0bccd56a4f820048dc031.tar.gz | |
- Work on JSON and JSON UDF's
modified:
storage/connect/json.cpp
storage/connect/jsonudf.cpp
storage/connect/tabjson.cpp
- CntReadNext: Enable EvalColumns for longjmp
modified:
storage/connect/connect.cc
Diffstat (limited to 'storage/connect/connect.cc')
| -rw-r--r-- | storage/connect/connect.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/storage/connect/connect.cc b/storage/connect/connect.cc index a54d8ebcc44..1b0db6dca6b 100644 --- a/storage/connect/connect.cc +++ b/storage/connect/connect.cc @@ -469,9 +469,12 @@ RCODE CntReadNext(PGLOBAL g, PTDB tdbp) } while (rc == RC_NF); + if (rc == RC_OK) + rc= EvalColumns(g, tdbp, false); + err: g->jump_level--; - return (rc != RC_OK) ? rc : EvalColumns(g, tdbp, false); + return rc; } // end of CntReadNext /***********************************************************************/ |