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

8e17a07a

Commit 8e17a07a authored 11 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge branch 'stable'

Fixes gh-47.

Update test results to be more deterministic.

Conflicts:
	src/box/space.cc
	src/box/tuple.cc
	test/wal/oom.result

parents fcb2fc64 678e9344

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

doc/user/language-reference.xml 13 additions, 10 deletions

doc/user/language-reference.xml
doc/user/preface.xml 5 additions, 5 deletions

doc/user/preface.xml
include/qbuf.h 102 additions, 0 deletions

include/qbuf.h
include/salloc.h 2 additions, 0 deletions

include/salloc.h
src/box/box.cc 2 additions, 2 deletions

src/box/box.cc
src/box/tuple.cc 17 additions, 3 deletions

src/box/tuple.cc
src/box/tuple.h 4 additions, 2 deletions

src/box/tuple.h
src/salloc.cc 89 additions, 42 deletions

src/salloc.cc
src/tarantool.cc 21 additions, 0 deletions

src/tarantool.cc
test/big/tree_variants.result 12 additions, 20 deletions

test/big/tree_variants.result
test/big/tree_variants.test.lua 5 additions, 5 deletions

test/big/tree_variants.test.lua
test/wal/oom.result 3 additions, 3 deletions

test/wal/oom.result

with 275 additions and 92 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