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

5a0deb9d

Commit 5a0deb9d authored 9 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into 1.6

parents 2fa598a8 4e1156fa

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/box/memtx_engine.cc 61 additions, 1 deletion

src/box/memtx_engine.cc
src/box/memtx_engine.h 7 additions, 0 deletions

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

src/box/memtx_rtree.cc
src/lib/salad/rtree.c 25 additions, 9 deletions

src/lib/salad/rtree.c
src/lib/salad/rtree.h 13 additions, 10 deletions

src/lib/salad/rtree.h
test/box/errinj_index.result 41 additions, 58 deletions

test/box/errinj_index.result
test/box/errinj_index.test.lua 5 additions, 14 deletions

test/box/errinj_index.test.lua
test/unit/CMakeLists.txt 2 additions, 2 deletions

test/unit/CMakeLists.txt
test/unit/rtree.cc 10 additions, 8 deletions

test/unit/rtree.cc
test/unit/rtree_itr.cc 25 additions, 17 deletions

test/unit/rtree_itr.cc

with 191 additions and 160 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