diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2017-08-08 17:36:54 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2017-08-08 17:36:54 +0200 |
| commit | 4d4ba60c6e7a589b0dc54de108cbd4204b6b3b6a (patch) | |
| tree | dfa6bf9f1e5b9b98f9ffe4295f633bf45b7a4d04 /storage/connect/jmgoconn.cpp | |
| parent | 017d9ccf5d623abb07b354f41aea63e6327decf2 (diff) | |
| download | mariadb-git-4d4ba60c6e7a589b0dc54de108cbd4204b6b3b6a.tar.gz | |
- Fix MDEV-13463 unescape table name during detection of table structure
modified: storage/connect/myconn.cpp
- Remove a few gcc warnings
modified: storage/connect/jmgoconn.cpp
modified: storage/connect/json.h
modified: storage/connect/tabjson.cpp
Diffstat (limited to 'storage/connect/jmgoconn.cpp')
| -rw-r--r-- | storage/connect/jmgoconn.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/jmgoconn.cpp b/storage/connect/jmgoconn.cpp index a51127c80a0..7535431c82e 100644 --- a/storage/connect/jmgoconn.cpp +++ b/storage/connect/jmgoconn.cpp @@ -732,7 +732,7 @@ int JMgoConn::DocUpdate(PGLOBAL g, PTDB tdbp) return RC_FX; if (env->CallBooleanMethod(job, docaddid, updlist, jkey, val)) - return NULL; + return RC_OK; env->DeleteLocalRef(jkey); } // endfor colp @@ -742,7 +742,7 @@ int JMgoConn::DocUpdate(PGLOBAL g, PTDB tdbp) jkey = env->NewStringUTF("$set"); if (env->CallBooleanMethod(job, docaddid, upd, jkey, updlist)) - return NULL; + return RC_OK; env->DeleteLocalRef(jkey); |