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

085f6e46

Commit 085f6e46 authored 8 years ago by Alexandr Lyapunov Committed by Konstantin Osipov 8 years ago

Downloads
- Patches
- Plain Diff

vinyl: fix several issues leaded to unnecessary conflict

Extend the conflict verifing test
Fix gh-1913

parent 53b3e49b

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/box/vinyl.c 47 additions, 29 deletions

src/box/vinyl.c
test/vinyl/tx_conflict.result 87 additions, 40 deletions

test/vinyl/tx_conflict.result
test/vinyl/tx_conflict.test.lua 87 additions, 36 deletions

test/vinyl/tx_conflict.test.lua
test/vinyl/tx_serial.result 289 additions, 0 deletions

test/vinyl/tx_serial.result
test/vinyl/tx_serial.test.lua 249 additions, 0 deletions

test/vinyl/tx_serial.test.lua

with 759 additions and 105 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