Merge remote-tracking branch 'origin/stable'

Conflicts:
	client/tarantool/tc_cli.c

client/tarantool/tc.c

@@ -119,9 +119,10 @@ static int get_admin_port(void)
 	}
 	struct tnt_tuple *tu = TNT_ILIST_TUPLE(&it);
 	tnt_iter(&ifl, tu);
-	if (!tnt_next(&ifl)) { goto end; }
+	if (!tnt_next(&ifl)) {
+		tc_error("Can't get admin port from primary port");
+	}
 	int port = *((uint32_t* )TNT_IFIELD_DATA(&ifl));
-end:
 	tnt_iter_free(&ifl);
 	tnt_iter_free(&it);
 	tnt_iter_free(&i);

client/tarantool/tc_cli.c

@@ -491,10 +491,10 @@ int tc_cli(void)
 		if (isatty(STDIN_FILENO)) /* Enable history on readline use only */
 			add_history(cmd.data);
 		tc_buf_cmdfy(&cmd, tc.opt.delim_len); /* Create admin cmd from STR */
+		enum tc_cli_cmd_ret ret;
 		if (delim_exists && tc_buf_str_isempty(&cmd))
 			goto next;
-		enum tc_cli_cmd_ret ret = tc_cli_cmd(cmd.data,
-						     cmd.used - 1);
+		 ret = tc_cli_cmd(cmd.data, cmd.used - 1);
 next:
 		tc_buf_clear(&cmd);
 		if (ret == TC_CLI_EXIT || feof(stdin)) {

debian/control

@@ -8,7 +8,7 @@ Build-Depends: cdbs, debhelper (>= 8),
  python-daemon,
  python-pexpect,
  libncurses5-dev,
- binutils-dev,
+ binutils-dev | libiberty-dev,
  libmysqlclient-dev,
  libpq-dev
 Section: database

src/box/box_lua.cc

@@ -426,6 +426,7 @@ static int
 lbox_tuple_unpack(struct lua_State *L)
 {
 	int argc = lua_gettop(L);
+	(void) argc;
 	struct tuple *tuple = lua_checktuple(L, 1);
 
 	struct tuple_iterator it;