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

fa78180c

Commit fa78180c authored 10 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/common-memtx-index-arena'

Conflicts:
	src/box/memtx_hash.cc
	src/box/memtx_tree.cc
	test/wal/oom.result

parents bbdcc5f7 d4815224

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/box/memtx_engine.cc 56 additions, 0 deletions

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

src/box/memtx_engine.h
src/box/memtx_hash.cc 5 additions, 35 deletions

src/box/memtx_hash.cc
src/box/memtx_tree.cc 4 additions, 33 deletions

src/box/memtx_tree.cc
src/box/memtx_tree.h 2 additions, 1 deletion

src/box/memtx_tree.h
src/lib/small/slab_arena.c 2 additions, 1 deletion

src/lib/small/slab_arena.c
test/wal/oom.result 4 additions, 4 deletions

test/wal/oom.result

with 99 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