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

8f867142

Commit 8f867142 authored 14 years ago by Roman Tokarev

Downloads
- Plain Diff

Merge branch 'master-stable' of farm.corp.mail.ru:tarantool into master-stable

Conflicts:
	test/lib/tarantool_connection.py
	test/lib/tarantool_silverbox_server.py
	test/lib/test_suite.py

parents 7bd33e64 e50e8fc5

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

core/util.c 3 additions, 2 deletions

core/util.c
mod/silverbox/box.c 15 additions, 7 deletions

mod/silverbox/box.c
mod/silverbox/index.c 13 additions, 5 deletions

mod/silverbox/index.c
test/box_big/sql.result 38 additions, 10 deletions

test/box_big/sql.result
test/box_big/sql.test 28 additions, 10 deletions

test/box_big/sql.test
test/lib/test_suite.py 1 addition, 0 deletions

test/lib/test_suite.py

with 98 additions and 34 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