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

03fd6a7c

Commit 03fd6a7c authored 9 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge branch 'fix-gh-966-upsert-qa' into 1.6

parents 84f44aad f0e4281e

No related branches found

No related tags found

Loading

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

src/box/box.cc 14 additions, 6 deletions

src/box/box.cc
src/box/errcode.h 1 addition, 0 deletions

src/box/errcode.h
src/box/index.h 2 additions, 1 deletion

src/box/index.h
src/box/lua/schema.lua 3 additions, 3 deletions

src/box/lua/schema.lua
src/box/memtx_engine.cc 35 additions, 9 deletions

src/box/memtx_engine.cc
src/box/space.cc 13 additions, 0 deletions

src/box/space.cc
src/box/space.h 6 additions, 0 deletions

src/box/space.h
src/box/tuple_update.cc 2 additions, 1 deletion

src/box/tuple_update.cc
test/box/alter.result 1 addition, 1 deletion

test/box/alter.result
test/box/alter_limits.result 2 additions, 2 deletions

test/box/alter_limits.result
test/box/misc.result 1 addition, 0 deletions

test/box/misc.result
test/box/update.result 0 additions, 152 deletions

test/box/update.result
test/box/update.test.lua 0 additions, 44 deletions

test/box/update.test.lua

with 80 additions and 219 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