- Fix for Bug#40179 Test main.query_cache failing randomly on Pushbuild, test weakness

- disable the test suffering from Bug#41098 Query Cache returns wrong result with
                                            concurrent insert
- additional improvements

Details:
- Move the test for the historic bug
  Bug 28249 Query Cache returns wrong result with concurrent insert / certain lock
  into its own testscript query_cache_28249.test.
- query_cache.test:
  - replace error numbers with error names
  - remove trailing spaces, replace tabs with spaces
  - reset of @@global.log_bin_trust_function_creators to its original value
    at the end of the test
- query_cache_28249.test:
  - replace sleep 5 with poll routine
  - avoid random differences caused by concurrent_inserts effects
  - improved comments and formatting

1 files changed, 2 insertions, 36 deletions

diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result
index 34c86d6c8c6..3c8ff8faddc 100644
--- a/mysql-test/r/query_cache.result
+++ b/mysql-test/r/query_cache.result
@@ -1116,12 +1116,13 @@ create procedure `p1`()
 begin
 select a, f1() from t1;
 end//
+SET @log_bin_trust_function_creators = @@global.log_bin_trust_function_creators;
 SET GLOBAL log_bin_trust_function_creators = 1;
 call p1()//
 a	f1()
 1	2
 2	2
-SET GLOBAL log_bin_trust_function_creators = 0;
+SET GLOBAL log_bin_trust_function_creators = @log_bin_trust_function_creators;
 drop procedure p1//
 drop function f1//
 drop table t1//
@@ -1615,41 +1616,6 @@ id
 DROP PROCEDURE proc29856;
 DROP TABLE t1;
 SET GLOBAL query_cache_size= default;
-Bug#28249 Query Cache returns wrong result with concurrent insert/ certain lock
-set GLOBAL query_cache_type=1;
-set GLOBAL query_cache_limit=10000;
-set GLOBAL query_cache_min_res_unit=0;
-set GLOBAL query_cache_size= 100000;
-flush tables;
-drop table if exists t1, t2;
-create table t1 (a int);
-create table t2 (a int);
-insert into t1 values (1),(2),(3);
-Locking table T2 with a write lock.
-lock table t2 write;
-Select blocked by write lock.
-select *, (select count(*) from t2) from t1;;
-Sleeing is ok, because selecting should be done very fast.
-Inserting into table T1.
-insert into t1 values (4);
-Unlocking the tables.
-unlock tables;
-Collecting result from previously blocked select.
-Next select should contain 4 rows, as the insert is long finished.
-select *, (select count(*) from t2) from t1;
-a	(select count(*) from t2)
-1	0
-2	0
-3	0
-4	0
-reset query cache;
-select *, (select count(*) from t2) from t1;
-a	(select count(*) from t2)
-1	0
-2	0
-3	0
-4	0
-drop table t1,t2;
 #
 # Bug#25132 disabled query cache: Qcache_free_blocks = 1
 #