From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 730D228022 for ; Tue, 5 Mar 2019 03:40:36 -0500 (EST) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MO-arFhnTI1N for ; Tue, 5 Mar 2019 03:40:36 -0500 (EST) Received: from smtp41.i.mail.ru (smtp41.i.mail.ru [94.100.177.101]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 1F4F026D19 for ; Tue, 5 Mar 2019 03:40:35 -0500 (EST) Date: Tue, 5 Mar 2019 11:40:33 +0300 From: Konstantin Osipov Subject: [tarantool-patches] Re: [PATCH v3 2/9] sql: save SQL parser errors in diag_set() Message-ID: <20190305084033.GO21955@chai> References: <438920c8d359811a86f30d3c55cf85d4584ed79b.1551530224.git.imeevma@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <438920c8d359811a86f30d3c55cf85d4584ed79b.1551530224.git.imeevma@gmail.com> Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-Help: List-Unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-Subscribe: List-Owner: List-post: List-Archive: To: tarantool-patches@freelists.org Cc: korablev@tarantool.org * imeevma@tarantool.org [19/03/03 23:25]: > + /*186 */_(ER_SQL_PARSER_GENERIC, "%s") \ Simply ER_SQL_PARSER > > /* > * !IMPORTANT! Please follow instructions at start of the file > diff --git a/src/box/sql/build.c b/src/box/sql/build.c > index f112c9f..deb5b89 100644 > --- a/src/box/sql/build.c > +++ b/src/box/sql/build.c > @@ -194,7 +194,8 @@ sql_finish_coding(struct Parse *parse_context) > sqlVdbeMakeReady(v, parse_context); > parse_context->rc = SQL_DONE; > } else { > - parse_context->rc = SQL_ERROR; > + if (parse_context->rc != SQL_TARANTOOL_ERROR) > + parse_context->rc = SQL_ERROR; Shouldn't this become bool abort? -- Konstantin Osipov, Moscow, Russia, +7 903 626 22 32 http://tarantool.io - www.twitter.com/kostja_osipov