Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

T

tarantool
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

69daa9cd

Commit 69daa9cd authored 13 years ago by Dmitry Simonenko

Downloads
- Plain Diff

Merge branch 'master' into core-lua-i64

Conflicts:
	test/box/lua.result

parents 9a0ded7d dba3684f

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

connector/c/include/libtnt/tnt_update.h 8 additions, 0 deletions

connector/c/include/libtnt/tnt_update.h
connector/c/tnt/tnt_update.c 39 additions, 1 deletion

connector/c/tnt/tnt_update.c
core/fiber.m 7 additions, 0 deletions

core/fiber.m
core/replication.m 13 additions, 2 deletions

core/replication.m
mod/box/box.m 71 additions, 13 deletions

mod/box/box.m
test/box/lua.result 1 addition, 0 deletions

test/box/lua.result
test/box/lua.test 1 addition, 0 deletions

test/box/lua.test
test/box_big/sql.result 1 addition, 1 deletion

test/box_big/sql.result
test/box_big/sql.test 3 additions, 6 deletions

test/box_big/sql.test
test/connector_c/update.c 120 additions, 42 deletions

test/connector_c/update.c
test/connector_c/update.result 35 additions, 9 deletions

test/connector_c/update.result

with 299 additions and 74 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment