fixup! 816019b6

Improve tests

mysql-test/suite/innodb/r/lock_isolation.result

@@ -3,24 +3,28 @@
 #
 CREATE TABLE t(a INT PRIMARY KEY, b INT) ENGINE=InnoDB;
 INSERT INTO t VALUES (1,1),(2,2);
-connect con1,localhost,root;
 BEGIN;
 SELECT * FROM t LOCK IN SHARE MODE;
 a	b
 1	1
 2	2
-connection default;
+connect con1,localhost,root;
+BEGIN;
+SELECT * FROM t;
+a	b
+1	1
+2	2
+connect con2,localhost,root;
 SET innodb_strict_isolation=ON;
 BEGIN;
 SELECT * FROM t;
 a	b
 1	1
 2	2
-connection con1;
+connection default;
 UPDATE t SET a=3 WHERE b=2;
 COMMIT;
-disconnect con1;
-connection default;
+connection con2;
 UPDATE t SET b=3;
 ERROR HY000: Record has changed since last read in table 't'
 SELECT * FROM t;
@@ -28,4 +32,19 @@ a	b
 1	1
 3	2
 COMMIT;
+disconnect con2;
+connection con1;
+UPDATE t SET b=3;
+SELECT * FROM t;
+a	b
+1	3
+2	2
+3	3
+COMMIT;
+disconnect con1;
+connection default;
+SELECT * FROM t;
+a	b
+1	3
+3	3
 DROP TABLE t;

mysql-test/suite/innodb/t/lock_isolation.test

@@ -6,19 +6,28 @@
 
 CREATE TABLE t(a INT PRIMARY KEY, b INT) ENGINE=InnoDB;
 INSERT INTO t VALUES (1,1),(2,2);
---connect con1,localhost,root
 BEGIN; SELECT * FROM t LOCK IN SHARE MODE;
---connection default
+--connect con1,localhost,root
+BEGIN;
+SELECT * FROM t;
+--connect con2,localhost,root
 SET innodb_strict_isolation=ON;
 BEGIN;
 SELECT * FROM t;
---connection con1
+--connection default
 UPDATE t SET a=3 WHERE b=2;
 COMMIT;
---disconnect con1
---connection default
+--connection con2
 --error ER_CHECKREAD
 UPDATE t SET b=3;
 SELECT * FROM t;
 COMMIT;
+--disconnect con2
+--connection con1
+UPDATE t SET b=3;
+SELECT * FROM t;
+COMMIT;
+--disconnect con1
+--connection default
+SELECT * FROM t;
 DROP TABLE t;

mysql-test/suite/sys_vars/r/sysvars_innodb.result

@@ -1567,6 +1567,18 @@ NUMERIC_BLOCK_SIZE	NULL
 ENUM_VALUE_LIST	OFF,ON
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	OPTIONAL
+VARIABLE_NAME	INNODB_STRICT_ISOLATION
+SESSION_VALUE	OFF
+DEFAULT_VALUE	OFF
+VARIABLE_SCOPE	SESSION
+VARIABLE_TYPE	BOOLEAN
+VARIABLE_COMMENT	Use strict transaction isolation.
+NUMERIC_MIN_VALUE	NULL
+NUMERIC_MAX_VALUE	NULL
+NUMERIC_BLOCK_SIZE	NULL
+ENUM_VALUE_LIST	OFF,ON
+READ_ONLY	NO
+COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	INNODB_STRICT_MODE
 SESSION_VALUE	ON
 DEFAULT_VALUE	ON