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

d7ab36da

Commit d7ab36da authored 9 years ago by Roman Tsisyk

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/proc-language-c' into 1.6

parents be8e48e7 baa6f184

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

src/box/CMakeLists.txt 1 addition, 1 deletion

src/box/CMakeLists.txt
src/box/box.cc 2 additions, 0 deletions

src/box/box.cc
src/box/func.cc 7 additions, 7 deletions

src/box/func.cc
src/box/lua/call.cc 69 additions, 87 deletions

src/box/lua/call.cc
src/box/lua/call.h 1 addition, 14 deletions

src/box/lua/call.h
src/box/lua/schema.lua 33 additions, 14 deletions

src/box/lua/schema.lua
src/box/port.cc 138 additions, 0 deletions

src/box/port.cc
src/box/port.h 35 additions, 0 deletions

src/box/port.h
src/ffisyms.cc 4 additions, 2 deletions

src/ffisyms.cc
test/app/function1.c 10 additions, 0 deletions

test/app/function1.c
test/app/function1.result 2 additions, 0 deletions

test/app/function1.result
test/app/function1.test.lua 3 additions, 0 deletions

test/app/function1.test.lua

with 305 additions and 125 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