Merge branch 'refactor-test-box-big-sql'

test/box_big/sql.result

@@ -205,8 +205,8 @@ delete from t1 where k0='key3'
 Delete OK, 1 row affected
 select * from t5 where k1='part1'
 Found 3 tuples:
-['11234567', 'part1', 'part2']
 ['01234567', 'part1', 'part2']
+['11234567', 'part1', 'part2']
 ['21234567', 'part1', 'part2_a']
 select * from t5 where k1='part2'
 No match

test/box_big/sql.test

 # encoding: tarantool
 #
+sql.sort = True
+
 print """#
 # A test case for Bug#729758
 # "SELECT fails with a disjunct and small LIMIT"
@@ -11,9 +13,7 @@ exec sql "insert into t0 values ('Roe', 'Richard')"
 exec sql "insert into t0 values ('Woe', 'Richard')"
 exec sql "insert into t0 values ('Major', 'Tomas')"
 exec sql "insert into t0 values ('Kytes', 'Tomas')"
-sql.sort = True
 exec sql "select * from t0 where k1='Richard' or k1='Tomas' or k1='Tomas' limit 5"
-sql.sort = False
 
 print """#
 # A test case for Bug#729879
@@ -74,12 +74,10 @@ exec admin "lua for k, v in box.space[5]:pairs() do print(v) end"
 exec sql "select * from t5 where k0='01234567'"
 exec sql "select * from t5 where k0='11234567'"
 exec sql "select * from t5 where k0='21234567'"
-sql.sort = True
 exec sql "select * from t5 where k1='part1'"
 exec sql "select * from t5 where k1='part1_a'"
 exec sql "select * from t5 where k1='part_none'"
 exec sql "call box.select('5', '1', 'part1', 'part2')"
-sql.sort = False 
 exec sql "insert into t7 values (1, 'hello')"
 exec sql "insert into t7 values (2, 'brave')"
 exec sql "insert into t7 values (3, 'new')"
@@ -151,11 +149,9 @@ exec sql "insert into t4 values (12, 'duplicate three')"
 exec sql "insert into t4 values (13, 'duplicate three')"
 exec sql "insert into t4 values (14, 'duplicate three')"
 exec sql "insert into t4 values (15, 'duplicate three')"
-sql.sort = True
 exec sql "select * from t4 where k1='duplicate one'"
 exec sql "select * from t4 where k1='duplicate two'"
 exec sql "select * from t4 where k1='duplicate three'"
-sql.sort = False
 exec sql "delete from t4 where k0=1"
 exec sql "delete from t4 where k0=2"
 exec sql "delete from t4 where k0=3"
@@ -186,4 +182,5 @@ exec sql "delete from t4 where k0=1"
 exec sql "delete from t4 where k0=2"
 exec sql "delete from t4 where k0=3"
 
+sql.sort = False
 # vim: syntax=python