From: imeevma@tarantool.org
To: korablev@tarantool.org
Cc: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH v2 1/1] temporary: locate missing diag
Date: Wed, 25 Nov 2020 15:06:29 +0300 [thread overview]
Message-ID: <0640f255cd365fdf54cfba492ebd3afdd9071fa0.1606305800.git.imeevma@gmail.com> (raw)
---
https://github.com/tarantool/tarantool/issues/5537
https://github.com/tarantool/tarantool/tree/imeevma/gh-5537-find-missing-diag
src/box/execute.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/box/execute.c b/src/box/execute.c
index 66eac9814..058d78d55 100644
--- a/src/box/execute.c
+++ b/src/box/execute.c
@@ -685,8 +685,11 @@ sql_execute(struct sql_stmt *stmt, struct port *port, struct region *region)
rc = sql_step(stmt);
assert(rc != SQL_ROW && rc != 0);
}
- if (rc != SQL_DONE)
+ if (rc != SQL_DONE) {
+ if (diag_last_error(&fiber()->diag) == NULL)
+ abort();
return -1;
+ }
return 0;
}
@@ -737,8 +740,11 @@ sql_prepare_and_execute(const char *sql, int len, const struct sql_bind *bind,
struct region *region)
{
struct sql_stmt *stmt;
- if (sql_stmt_compile(sql, len, NULL, &stmt, NULL) != 0)
+ if (sql_stmt_compile(sql, len, NULL, &stmt, NULL) != 0) {
+ if (diag_last_error(&fiber()->diag) == NULL)
+ abort();
return -1;
+ }
assert(stmt != NULL);
enum sql_serialization_format format = sql_column_count(stmt) > 0 ?
DQL_EXECUTE : DML_EXECUTE;
--
2.25.1
reply other threads:[~2020-11-25 12:06 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0640f255cd365fdf54cfba492ebd3afdd9071fa0.1606305800.git.imeevma@gmail.com \
--to=imeevma@tarantool.org \
--cc=korablev@tarantool.org \
--cc=tarantool-patches@dev.tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH v2 1/1] temporary: locate missing diag' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox