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

1e269784

Commit 1e269784 authored 9 years ago by bigbes

Downloads
- Plain Diff

Merge branch '1.6' of github.com:tarantool/tarantool into 1.6

parents 2146ead4 697b1734

No related branches found

No related tags found

Loading

Changes 16

Hide whitespace changes

Inline Side-by-side

Showing

src/box/alter.cc 34 additions, 32 deletions

src/box/alter.cc
src/box/box.cc 11 additions, 1 deletion

src/box/box.cc
src/box/engine.cc 8 additions, 3 deletions

src/box/engine.cc
src/box/engine.h 5 additions, 8 deletions

src/box/engine.h
src/box/lua/space.cc 1 addition, 1 deletion

src/box/lua/space.cc
src/box/memtx_engine.cc 19 additions, 47 deletions

src/box/memtx_engine.cc
src/box/memtx_engine.h 2 additions, 2 deletions

src/box/memtx_engine.h
src/box/sophia_engine.cc 22 additions, 22 deletions

src/box/sophia_engine.cc
src/box/sophia_engine.h 2 additions, 2 deletions

src/box/sophia_engine.h
src/box/tuple.h 16 additions, 5 deletions

src/box/tuple.h
src/box/txn.cc 42 additions, 46 deletions

src/box/txn.cc
src/box/txn.h 58 additions, 24 deletions

src/box/txn.h
src/lib/salad/stailq.h 205 additions, 0 deletions

src/lib/salad/stailq.h
test/unit/CMakeLists.txt 1 addition, 0 deletions

test/unit/CMakeLists.txt
test/unit/stailq.c 74 additions, 0 deletions

test/unit/stailq.c
test/unit/stailq.result 30 additions, 0 deletions

test/unit/stailq.result

with 530 additions and 193 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