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

src/lua/fiber.cc

@@ -772,6 +772,8 @@ lbox_fiber_testcancel(struct lua_State *L)
 static const struct luaL_reg lbox_fiber_meta [] = {
 	{"id", lbox_fiber_id},
 	{"name", lbox_fiber_name},
+	{"cancel", lbox_fiber_cancel},
+	{"resume", lbox_fiber_resume},
 	{"__gc", lbox_fiber_gc},
 	{NULL, NULL}
 };

test/box/fiber.result

@@ -811,3 +811,26 @@ box_fiber_run_test()
   - 'B: odd  5'
   - 'status: dead'
 ...
+function testfun() while true do box.fiber.sleep(10) end end
+---
+...
+f = box.fiber.wrap(testfun)
+---
+...
+f:cancel()
+---
+...
+f:resume()
+---
+- error: 'fiber.resume(): the fiber is dead'
+...
+fib_id = box.fiber.wrap(testfun):id()
+---
+...
+box.fiber.find(fib_id):cancel()
+---
+...
+box.fiber.find(fib_id)
+---
+- null
+...

test/box/fiber.test.lua

@@ -273,3 +273,11 @@ space:drop()
 dofile("fiber.lua")
 -- print run fiber's test
 box_fiber_run_test()
+
+function testfun() while true do box.fiber.sleep(10) end end
+f = box.fiber.wrap(testfun)
+f:cancel()
+f:resume()
+fib_id = box.fiber.wrap(testfun):id()
+box.fiber.find(fib_id):cancel()
+box.fiber.find(fib_id)

test/module/net_sql.mysql.result

@@ -27,6 +27,11 @@ c = box.net.sql.connect('abcd')
 ---
 - error: '../../src/module/sql/sql.lua:29: Unknown driver ''abcd'''
 ...
+c = box.net.sql.connect('mysql')
+---
+- error: '../../src/module/sql/sql.lua:64: Usage: box.net.sql.connect(''mysql'', host,
+    port, user, password, db, ...)'
+...
 function dump(v) return box.cjson.encode(v) end
 ---
 ...

test/module/net_sql.mysql.test.lua

@@ -10,6 +10,7 @@ os.execute("cp ../../src/module/mysql/mysql.so box/net/")
 require("box.net.mysql")
 
 c = box.net.sql.connect('abcd')
+c = box.net.sql.connect('mysql')
 function dump(v) return box.cjson.encode(v) end
 
 connect = {}