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

0affbe03

Commit 0affbe03 authored 9 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/gh-863-box-lua-yield' into 1.6

Conflicts:
	src/box/lua/error.cc

parents 103caa8f 28704d00

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

src/box/lua/call.cc 38 additions, 11 deletions

src/box/lua/call.cc
src/box/lua/error.cc 10 additions, 3 deletions

src/box/lua/error.cc
src/box/lua/error.h 3 additions, 0 deletions

src/box/lua/error.h
src/box/lua/index.cc 191 additions, 17 deletions

src/box/lua/index.cc
src/box/lua/schema.lua 79 additions, 15 deletions

src/box/lua/schema.lua
src/box/lua/space.cc 10 additions, 2 deletions

src/box/lua/space.cc
src/box/lua/tuple.cc 7 additions, 12 deletions

src/box/lua/tuple.cc
src/box/lua/tuple.h 12 additions, 1 deletion

src/box/lua/tuple.h
src/lua/utils.cc 17 additions, 0 deletions

src/lua/utils.cc
src/lua/utils.h 11 additions, 0 deletions

src/lua/utils.h
test/box/select.result 132 additions, 53 deletions

test/box/select.result
test/box/select.test.lua 104 additions, 60 deletions

test/box/select.test.lua

with 614 additions and 174 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