mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Adjusted a filaing test and re-enabled it.
mysql-test/r/query_cache_wlock_invalidate_func.result: Adjusted test. Query cache doesn't support multiple statements and thus using a delimiter change won't work. mysql-test/t/disabled.def: Enabled the query_cache_wlock_invalidate_func test. mysql-test/t/query_cache_wlock_invalidate_func.test: Adjusted test. Query cache doesn't support multiple statements and thus using a delimiter change won't work.
This commit is contained in:
@@ -51,11 +51,7 @@ id value
|
||||
LOCK TABLE t1 WRITE;
|
||||
** Connection con1 **
|
||||
** Asynchronous Execution **
|
||||
SET @startTime = NOW();
|
||||
SELECT * FROM t1;
|
||||
SET @endTime = NOW();
|
||||
SET @TimeDifference = TIME_TO_SEC(TIMEDIFF(@endTime, @startTime)) >= 2;
|
||||
SELECT @TimeDifference;|
|
||||
** Connection con0 **
|
||||
Sleeping 2 Seconds before unlock
|
||||
UNLOCK TABLES;
|
||||
@@ -65,8 +61,6 @@ id value
|
||||
1 val1
|
||||
2 val2
|
||||
3 val3
|
||||
@TimeDifference
|
||||
1
|
||||
Testing for value OFF
|
||||
** Connection con0 **
|
||||
SET SESSION query_cache_wlock_invalidate = OFF;
|
||||
@@ -91,7 +85,14 @@ Qcache_queries_in_cache 1
|
||||
1 Expected
|
||||
'#----------------------------FN_DYNVARS_136_04---------------------#'
|
||||
SELECT * FROM t1;
|
||||
id value
|
||||
1 val1
|
||||
2 val2
|
||||
3 val3
|
||||
SHOW STATUS LIKE 'Qcache_queries_in_cache';
|
||||
Variable_name Value
|
||||
Qcache_queries_in_cache 1
|
||||
1 Expected
|
||||
** Connection con1 **
|
||||
SELECT * FROM t1;
|
||||
id value
|
||||
@@ -101,25 +102,16 @@ id value
|
||||
** Connection con0 **
|
||||
LOCK TABLE t1 WRITE;
|
||||
** Connection con1 **
|
||||
** Asynchronous Execution **
|
||||
SET @startTime = NOW();
|
||||
** Should not be blocked **
|
||||
SELECT * FROM t1;
|
||||
SET @endTime = NOW();
|
||||
SET @TimeDifference = TIME_TO_SEC(TIMEDIFF(@endTime, @startTime));
|
||||
SELECT @TimeDifference;|
|
||||
** Connection con0 **
|
||||
Sleeping 2 Seconds before unlock
|
||||
UNLOCK TABLES;
|
||||
** Connection con1 **
|
||||
** Asynchronous Result **
|
||||
id value
|
||||
1 val1
|
||||
2 val2
|
||||
3 val3
|
||||
@TimeDifference
|
||||
2
|
||||
'Bug#35390 the time difference should not be 2 seconds in this case,'
|
||||
'it should be less than a second;'
|
||||
** Connection con0 **
|
||||
Sleeping 2 Seconds before unlock
|
||||
UNLOCK TABLES;
|
||||
** Connection con1 **
|
||||
'#----------------------------FN_DYNVARS_136_05------------------------#'
|
||||
SET GLOBAL query_cache_wlock_invalidate = OFF;
|
||||
** Connecting con_int1 using root **
|
||||
|
@@ -15,7 +15,6 @@ ps_ddl : Bug#12093 2007-12-14 pending WL#4165 / WL#4166
|
||||
csv_alter_table : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables
|
||||
event_scheduler_basic: BUG#35997 server seems to crash.
|
||||
event_scheduler_func: BUG#35997 server seems to crash.
|
||||
query_cache_wlock_invalidate_func: Bug#35390 causes not deterministic results.
|
||||
thread_cache_size_func: BUG#35988 Due to not deterministic results
|
||||
user_limits : Bug#23921 random failure of user_limits.test
|
||||
|
||||
|
@@ -130,16 +130,7 @@ LOCK TABLE t1 WRITE;
|
||||
connection con1;
|
||||
|
||||
--echo ** Asynchronous Execution **
|
||||
delimiter |;
|
||||
|
||||
send
|
||||
SET @startTime = NOW();
|
||||
SELECT * FROM t1;
|
||||
SET @endTime = NOW();
|
||||
SET @TimeDifference = TIME_TO_SEC(TIMEDIFF(@endTime, @startTime)) >= 2;
|
||||
SELECT @TimeDifference;|
|
||||
|
||||
delimiter ;|
|
||||
send SELECT * FROM t1;
|
||||
|
||||
--echo ** Connection con0 **
|
||||
connection con0;
|
||||
@@ -192,13 +183,10 @@ SHOW STATUS LIKE 'Qcache_queries_in_cache';
|
||||
# Testing for blockage of access
|
||||
#
|
||||
|
||||
disable_result_log;
|
||||
|
||||
SELECT * FROM t1;
|
||||
|
||||
SHOW STATUS LIKE 'Qcache_queries_in_cache';
|
||||
|
||||
enable_result_log;
|
||||
--echo 1 Expected
|
||||
|
||||
--echo ** Connection con1 **
|
||||
connection con1;
|
||||
@@ -213,17 +201,8 @@ LOCK TABLE t1 WRITE;
|
||||
--echo ** Connection con1 **
|
||||
connection con1;
|
||||
|
||||
--echo ** Asynchronous Execution **
|
||||
delimiter |;
|
||||
|
||||
send
|
||||
SET @startTime = NOW();
|
||||
--echo ** Should not be blocked **
|
||||
SELECT * FROM t1;
|
||||
SET @endTime = NOW();
|
||||
SET @TimeDifference = TIME_TO_SEC(TIMEDIFF(@endTime, @startTime));
|
||||
SELECT @TimeDifference;|
|
||||
|
||||
delimiter ;|
|
||||
|
||||
--echo ** Connection con0 **
|
||||
connection con0;
|
||||
@@ -234,11 +213,6 @@ UNLOCK TABLES;
|
||||
|
||||
--echo ** Connection con1 **
|
||||
connection con1;
|
||||
--echo ** Asynchronous Result **
|
||||
reap;
|
||||
|
||||
--echo 'Bug#35390 the time difference should not be 2 seconds in this case,'
|
||||
--echo 'it should be less than a second;'
|
||||
|
||||
--echo '#----------------------------FN_DYNVARS_136_05------------------------#'
|
||||
#
|
||||
|
Reference in New Issue
Block a user