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

19a47072

Commit 19a47072 authored 13 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge branch 'master-stable'

Manually merge Bug#735140 from master-stable
to master.

Conflicts:
	mod/box/index.m

parents 881e1ed5 bc3514ea

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

mod/box/box.m 2 additions, 2 deletions

mod/box/box.m
mod/box/index.h 1 addition, 1 deletion

mod/box/index.h
mod/box/index.m 5 additions, 1 deletion

mod/box/index.m
test/box/sql.result 19 additions, 0 deletions

test/box/sql.result
test/box/sql.test 23 additions, 0 deletions

test/box/sql.test
test/box/tarantool_bug735140.cfg 25 additions, 0 deletions

test/box/tarantool_bug735140.cfg

with 75 additions and 4 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