Skip to content
Snippets Groups Projects
Commit a67552c6 authored by Konstantin Osipov's avatar Konstantin Osipov
Browse files

Merge branch 'blueprint-multipart-primary-key'

Conflicts:
	mod/box/index.h
	mod/box/index.m
	mod/box/tree.m
	test/box/lua.result
	test/box/lua.test
	test/box_big/tarantool.cfg

As part of the merge, revers int -> u32
type change for key_cardinality, done in the
blueprint-multipart-primary-key branch (didn't
notice during code review, but it breaks
formatting in errcode.h).

Merge new and old tests in box_big
manually.
parents 75c494db 466a1a93
No related branches found
No related tags found
Loading
Showing
with 1630 additions and 258 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 to comment