Commit 3190eff8 authored by Davi Arnaut's avatar Davi Arnaut

Reduce test case runtime.

mysql-test/r/lock_multi_bug38499.result:
  Update test case result.
mysql-test/r/lock_multi_bug38691.result:
  Update test case result.
mysql-test/t/lock_multi_bug38499.test:
  Do not sync .frm files.
mysql-test/t/lock_multi_bug38691.test:
  Do not sync .frm files.
parent 69174242
SET @odl_sync_frm = @@global.sync_frm;
SET @@global.sync_frm = OFF;
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
CREATE TABLE t1( a INT, b INT ); CREATE TABLE t1( a INT, b INT );
INSERT INTO t1 VALUES (1, 1), (2, 2), (3, 3), (4, 4); INSERT INTO t1 VALUES (1, 1), (2, 2), (3, 3), (4, 4);
...@@ -17,3 +19,4 @@ ALTER TABLE t1 ADD COLUMN a INT; ...@@ -17,3 +19,4 @@ ALTER TABLE t1 ADD COLUMN a INT;
# 2.2.1. normal mode # 2.2.1. normal mode
# 2.2.2. PS mode # 2.2.2. PS mode
DROP TABLE t1; DROP TABLE t1;
SET @@global.sync_frm = @odl_sync_frm;
SET @odl_sync_frm = @@global.sync_frm;
SET @@global.sync_frm = OFF;
DROP TABLE IF EXISTS t1,t2,t3; DROP TABLE IF EXISTS t1,t2,t3;
CREATE TABLE t1 ( CREATE TABLE t1 (
a int(11) unsigned default NULL, a int(11) unsigned default NULL,
...@@ -15,3 +17,4 @@ CREATE TABLE t3 SELECT * FROM t1; ...@@ -15,3 +17,4 @@ CREATE TABLE t3 SELECT * FROM t1;
# normal mode # normal mode
# PS mode # PS mode
DROP TABLE t1, t2, t3; DROP TABLE t1, t2, t3;
SET @@global.sync_frm = @odl_sync_frm;
...@@ -5,6 +5,9 @@ ...@@ -5,6 +5,9 @@
# Save the initial number of concurrent sessions # Save the initial number of concurrent sessions
--source include/count_sessions.inc --source include/count_sessions.inc
SET @odl_sync_frm = @@global.sync_frm;
SET @@global.sync_frm = OFF;
connect (locker,localhost,root,,); connect (locker,localhost,root,,);
connect (writer,localhost,root,,); connect (writer,localhost,root,,);
...@@ -214,6 +217,8 @@ DROP TABLE t1; ...@@ -214,6 +217,8 @@ DROP TABLE t1;
--disconnect locker --disconnect locker
--disconnect writer --disconnect writer
SET @@global.sync_frm = @odl_sync_frm;
# End of 5.0 tests # End of 5.0 tests
# Wait till all disconnects are completed # Wait till all disconnects are completed
......
...@@ -8,6 +8,9 @@ ...@@ -8,6 +8,9 @@
# Save the initial number of concurrent sessions # Save the initial number of concurrent sessions
--source include/count_sessions.inc --source include/count_sessions.inc
SET @odl_sync_frm = @@global.sync_frm;
SET @@global.sync_frm = OFF;
# Test to see if select will get the lock ahead of low priority update # Test to see if select will get the lock ahead of low priority update
connect (locker,localhost,root,,); connect (locker,localhost,root,,);
...@@ -136,6 +139,8 @@ DROP TABLE t1, t2, t3; ...@@ -136,6 +139,8 @@ DROP TABLE t1, t2, t3;
--disconnect locker --disconnect locker
--disconnect writer --disconnect writer
SET @@global.sync_frm = @odl_sync_frm;
# Wait till all disconnects are completed # Wait till all disconnects are completed
--source include/wait_until_count_sessions.inc --source include/wait_until_count_sessions.inc
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment