[tarantool-patches] Re: [PATCH 2/3] txn: merge struct sql_txn into struct txn

[n.pettik]

> On 19 Aug 2019, at 23:47, Vladislav Shpilevoy <v.shpilevoy at tarantool.org> wrote:
> 
> Hi! Thanks for the fixes! Mine is in a separate commit
> on the branch (after "txn: merge struct sql_txn into struct txn"),
> and below. Please, squash if you are ok with that.

Yep, thanks, squashed.

> Talking of savepoint duplicate names - it is a bug existing in 2.2.1
> too. I think, we should backport the fix. Or not. Up to Kirill.
> 
> ===============================================================
> 
> commit e955f4ad3ad4114a15f35594153ed66f3c23d661
> Author: Vladislav Shpilevoy <v.shpilevoy at tarantool.org>
> Date:   Mon Aug 19 22:39:15 2019 +0200
> 
>    Review fix
> 
> diff --git a/src/box/txn.c b/src/box/txn.c
> index bd024a73c..1002c2136 100644
> --- a/src/box/txn.c
> +++ b/src/box/txn.c
> @@ -805,7 +805,7 @@ box_txn_rollback_to_savepoint(box_txn_savepoint_t *svp)
> 	}
> 	txn_rollback_to_svp(txn, svp->stmt);
> 	/* Discard from list all newer savepoints. */
> -	struct rlist discard = { };
> +	RLIST_HEAD(discard);
> 	rlist_cut_before(&discard, &txn->savepoints, &svp->link);
> 	txn->fk_deferred_count = svp->fk_deferred_count;
> 	return 0;
> @@ -825,7 +825,7 @@ txn_savepoint_release(struct txn_savepoint *svp)
> 	 * Discard current savepoint alongside with all
> 	 * created after it savepoints.
> 	 */
> -	struct rlist discard = { };
> +	RLIST_HEAD(discard);
> 	rlist_cut_before(&discard, &txn->savepoints, rlist_next(&svp->link));
> }
> 
>