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

492253f3

Commit 492253f3 authored 11 years ago by Roman Tsisyk

Downloads
- Plain Diff

Merge branch 'stable'

Conflicts:
	include/errcode.h
	test/big/lua.result
	test/big/lua.test
	test/box/lua_misc.result

parents 7ece7155 c3efdffa

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

debian/changelog 6 additions, 0 deletions

debian/changelog
include/errcode.h 1 addition, 1 deletion

include/errcode.h
src/box/box_lua.cc 9 additions, 4 deletions

src/box/box_lua.cc
src/box/tuple_update.cc 2 additions, 2 deletions

src/box/tuple_update.cc
src/box/tuple_update.h 1 addition, 2 deletions

src/box/tuple_update.h
test/big/lua.result 20 additions, 0 deletions

test/big/lua.result
test/big/lua.test.lua 11 additions, 0 deletions

test/big/lua.test.lua

with 50 additions and 9 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