Merge branch 'master' of https://github.com/tarantool/tarantool

.gitignore

@@ -75,3 +75,21 @@ doc/www/content/doc
 extra/dist/default/tarantool
 extra/com.tarantool.tarantool.plist
 extra/postflight
+build-area/*
+debian/files
+debian/stamp-makefile-build
+debian/stamp-makefile-install
+debian/tarantool-common.debhelper.log
+debian/tarantool-common.postinst.debhelper
+debian/tarantool-common.postrm.debhelper
+debian/tarantool-common.prerm.debhelper
+debian/tarantool-common.substvars
+debian/tarantool-common/*
+debian/tarantool-dev.debhelper.log
+debian/tarantool-dev.substvars
+debian/tarantool-dev/*
+debian/tarantool.debhelper.log
+debian/tarantool.substvars
+debian/tarantool/*
+debian/tmp/*
+

test/box-py/iproto.result

@@ -143,6 +143,24 @@ space:drop()
 space2:drop()
 ---
 ...
+space = box.schema.create_space('gh1280', { engine = 'sophia' })
+---
+...
+index = space:create_index('primary')
+---
+...
+space:insert({1})
+---
+...
+space:insert({2, 'Music'})
+---
+...
+space:insert({3, 'Length', 93})
+---
+...
+space:drop()
+---
+...
 box.schema.user.revoke('guest', 'read,write,execute', 'universe')
 ---
 ...

test/box-py/iproto.test.py

@@ -281,4 +281,20 @@ c.close()
 
 admin("space:drop()")
 admin("space2:drop()")
+
+#
+# gh-1280 Segmentation fault on space.select(tuple()) or space.select([2])
+#
+admin("space = box.schema.create_space('gh1280', { engine = 'sophia' })")
+admin("index = space:create_index('primary')")
+admin("space:insert({1})")
+admin("space:insert({2, 'Music'})")
+admin("space:insert({3, 'Length', 93})")
+
+iproto.py_con.space('gh1280').select([])
+iproto.py_con.space('gh1280').select(list())
+
+
+admin("space:drop()")
+
 admin("box.schema.user.revoke('guest', 'read,write,execute', 'universe')")

sophia @ 732a861a

-Subproject commit a7c6db77fa558b44f33226164400e090a6e05c16
+Subproject commit 732a861a11f56e335e21e482dd39ff22a7a4362b