diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2019-06-16 10:34:23 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2019-06-16 10:34:23 +0000 |
| commit | cad61f5f361d7328d09c82d5aca85d25e0a6274e (patch) | |
| tree | 7c1eadf7cbeb4a5b8664f863742e4e59cd33ce7d /databases/tarantool/files/patch-src-box-vy_stmt.c | |
| parent | security/py-fail2ban: Add support for devel/py-pyinotify (diff) | |
Update to 2.1.2
- Fix linking: change from libmsgpuck.a to libmsgpuck.so
Changes: https://github.com/tarantool/tarantool/releases
Notes
Notes:
svn path=/head/; revision=504295
Diffstat (limited to 'databases/tarantool/files/patch-src-box-vy_stmt.c')
| -rw-r--r-- | databases/tarantool/files/patch-src-box-vy_stmt.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/databases/tarantool/files/patch-src-box-vy_stmt.c b/databases/tarantool/files/patch-src-box-vy_stmt.c new file mode 100644 index 000000000000..6a1c08fdf21e --- /dev/null +++ b/databases/tarantool/files/patch-src-box-vy_stmt.c @@ -0,0 +1,28 @@ +Obtained from: https://github.com/tarantool/tarantool/commit/518557963250fd30b22005376feb4e0e2a6786a1 + +--- src/box/vy_stmt.c.orig ++++ src/box/vy_stmt.c +@@ -447,18 +447,19 @@ vy_stmt_new_surrogate_delete_raw(struct tuple_format *format, + struct tuple_field *field; + struct json_token *parent = &format->fields.root; + while (true) { +- int idx; +- while ((idx = mp_stack_advance(&stack)) == -1) { ++ struct mp_frame *frame = mp_stack_top(&stack); ++ while (!mp_frame_advance(frame)) { + mp_stack_pop(&stack); + if (mp_stack_is_empty(&stack)) + goto finish; ++ frame = mp_stack_top(&stack); + parent = parent->parent; + } + struct json_token token; +- switch (mp_stack_type(&stack)) { ++ switch (frame->type) { + case MP_ARRAY: + token.type = JSON_TOKEN_NUM; +- token.num = idx; ++ token.num = frame->idx; + break; + case MP_MAP: + if (mp_typeof(*src_pos) != MP_STR) { |