summaryrefslogtreecommitdiff
path: root/storage/connect/user_connect.cc
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2019-03-03 21:24:02 +0100
committerOlivier Bertrand <bertrandop@gmail.com>2019-03-03 21:24:02 +0100
commitd421df7ea67182750562f22bd514e152f4906da3 (patch)
tree84b1b6e626ba5f57c797eedcb12889d71a4f760a /storage/connect/user_connect.cc
parentdc8d1ada9fe9db9ab6caae98e29527efa2ca8c2a (diff)
downloadmariadb-git-d421df7ea67182750562f22bd514e152f4906da3.tar.gz
- Fix MDEV-18292: CONNECT Engine JDBC not able to issue
simple UPDATE statement from trigger or stored procedure Was not fixed when the same table was called several times with different modes. Fixed by checking if a new statement is compatible in the start_stmt function. It nows do the same checks than external_lock. modified: storage/connect/ha_connect.cc modified: storage/connect/ha_connect.h - typo modified: storage/connect/user_connect.cc
Diffstat (limited to 'storage/connect/user_connect.cc')
-rw-r--r--storage/connect/user_connect.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/connect/user_connect.cc b/storage/connect/user_connect.cc
index a2a8faf9b38..d366e0222df 100644
--- a/storage/connect/user_connect.cc
+++ b/storage/connect/user_connect.cc
@@ -177,7 +177,8 @@ bool user_connect::CheckCleanup(bool force)
g->Createas = 0;
g->Alchecked = 0;
g->Mrr = 0;
- last_query_id= thdp->query_id;
+ g->More = 0;
+ last_query_id= thdp->query_id;
if (trace(65) && !force)
printf("=====> Begin new query %llu\n", last_query_id);