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

9f0ce25b

Commit 9f0ce25b authored 12 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge branch 'box-luaret'

Conflicts:
	mod/box/box_lua.m
	test/box/lua.result
	test/box/lua.test
	test/box_big/sql.result

parents 0f1ba71b fb31b15e

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

core/tarantool_lua.m 5 additions, 5 deletions

core/tarantool_lua.m
include/tarantool.h 4 additions, 0 deletions

include/tarantool.h
mod/box/box_lua.m 39 additions, 10 deletions

mod/box/box_lua.m
test/box/lua.result 18 additions, 4 deletions

test/box/lua.result
test/box/lua.test 7 additions, 0 deletions

test/box/lua.test
test/box_big/sql.result 6 additions, 6 deletions

test/box_big/sql.result
test/box_big/sql.test 2 additions, 2 deletions

test/box_big/sql.test

with 81 additions and 27 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