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

6a8ba4c8

Commit 6a8ba4c8 authored 11 years ago by Roman Tsisyk

Downloads
- Plain Diff

Merge branch 'stable'

Conflicts:
	src/lua/init.cc
	test/box/fiber.result
	test/box/fiber.test
	test/module/net_sql.mysql.result
	test/module/net_sql.mysql.test

parents c826ea8f 2be3151c

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/lua/fiber.cc 2 additions, 0 deletions

src/lua/fiber.cc
test/box/fiber.result 23 additions, 0 deletions

test/box/fiber.result
test/box/fiber.test.lua 8 additions, 0 deletions

test/box/fiber.test.lua
test/module/net_sql.mysql.result 5 additions, 0 deletions

test/module/net_sql.mysql.result
test/module/net_sql.mysql.test.lua 1 addition, 0 deletions

test/module/net_sql.mysql.test.lua

with 39 additions and 0 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