Merge lp:~tsarev/percona-server/5.5-query_cache_enhance-fix into lp:percona-server/5.5

[Oleg Tsarev]

Fix bug in query_cache_enhanve.patch: I added new status of thread - "Waiting on query cache mutex " incorrect - I backup old status before trying to lock mutex, but restore and after mutex lock, but after many other things.
As result - in 5.5.14 query_cache_debug fail

I also remove some SLEEP from tests, replace by debug_sync.
I can't remove all sleep, because DEBUG_SYNC change the status of thread, and I testing status.

[Oleg Tsarev (tsarev)]

http://jenkins.percona.com/view/Percona%20Server%205.5/job/percona-server-5.5-param/72

[Laurynas Biveinis (laurynas-biveinis)]

LGTM

review: Approve

=== modified file 'mysql-test/query_cache_enhance.patch/percona_status_wait_query_cache_mutex.result'
--- mysql-test/query_cache_enhance.patch/percona_status_wait_query_cache_mutex.result	2011-03-14 13:24:08 +0000
+++ mysql-test/query_cache_enhance.patch/percona_status_wait_query_cache_mutex.result	2011-08-03 16:25:35 +0000
@@ -1,4 +1,4 @@
-set GLOBAL query_cache_size=1355776;
+SET GLOBAL query_cache_size=1355776;
 flush query cache;
 flush query cache;
 reset query cache;
@@ -8,20 +8,16 @@
 INSERT INTO t VALUES (0,1);
 INSERT INTO t VALUES (1,2);
 INSERT INTO t VALUES (2,3);
-SELECT number from t where id > 0;
-number
-2
-3
-SET SESSION debug="+d,status_wait_query_cache_mutex_sleep";
-SELECT number from t where id > 0;
-SET SESSION debug="+d,status_wait_query_cache_mutex_sleep";
-SELECT number from t where id > 0;
-SET SESSION debug="+d,status_wait_query_cache_mutex_sleep";
+SET SESSION debug="+d,status_waiting_on_query_cache_mutex_sleep";
+SET DEBUG_SYNC='status_waiting_on_query_cache_mutex SIGNAL thread_ready';
+SELECT number from t where id > 0;
 SHOW PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Rows_sent	Rows_examined	Rows_read
-Id	root	localhost	test	Sleep	Time		NULL	Rows_sent	Rows_examined	Rows_read
-Id	root	localhost	test	Query	Time	Waiting on query cache mutex	SELECT number from t where id > 0	Rows_sent	Rows_examined	Rows_read
-Id	root	localhost	test	Query	Time	Waiting on query cache mutex	SELECT number from t where id > 0	Rows_sent	Rows_examined	Rows_read
-Id	root	localhost	test	Query	Time	NULL	SHOW PROCESSLIST	Rows_sent	Rows_examined	Rows_read
+###	root	###	test	Query	###	NULL	SHOW PROCESSLIST	###	###	###
+###	root	###	test	Query	###	Waiting on query cache mutex	SELECT number from t where id > 0	###	###	###
+SELECT id, info, state FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id;
+id	info	state
+###	SELECT id, info, state FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id	executing
+###	SELECT number from t where id > 0	Waiting on query cache mutex
 DROP TABLE t;
-set GLOBAL query_cache_size=0;
+SET GLOBAL query_cache_size=0;
 
=== modified file 'mysql-test/query_cache_enhance.patch/percona_status_wait_query_cache_mutex.test'
--- mysql-test/query_cache_enhance.patch/percona_status_wait_query_cache_mutex.test	2011-03-14 13:24:08 +0000
+++ mysql-test/query_cache_enhance.patch/percona_status_wait_query_cache_mutex.test	2011-08-03 16:25:35 +0000
@@ -1,6 +1,7 @@
 --source include/have_query_cache.inc
 --source include/have_debug.inc
-set GLOBAL query_cache_size=1355776;
+--source include/have_debug_sync.inc
+SET GLOBAL query_cache_size=1355776;
 --source include/percona_query_cache_with_comments_clear.inc
 
 -- disable_warnings
@@ -10,28 +11,21 @@
 INSERT INTO t VALUES (0,1);
 INSERT INTO t VALUES (1,2);
 INSERT INTO t VALUES (2,3);
-SELECT number from t where id > 0;
---connect (conn0,localhost,root,,)
---connect (conn1,localhost,root,,)
---connect (conn2,localhost,root,,)
-
---connection conn0
---error 0, ER_UNKNOWN_SYSTEM_VARIABLE
-SET SESSION debug="+d,status_wait_query_cache_mutex_sleep";
-SEND SELECT number from t where id > 0;
-SLEEP 1.0;
-
---connection conn1
---error 0, ER_UNKNOWN_SYSTEM_VARIABLE
-SET SESSION debug="+d,status_wait_query_cache_mutex_sleep";
-SEND SELECT number from t where id > 0;
-SLEEP 1.0;
-
---connection conn2
---error 0, ER_UNKNOWN_SYSTEM_VARIABLE
-SET SESSION debug="+d,status_wait_query_cache_mutex_sleep";
---replace_column 1 Id 6 Time 9 Rows_sent 10 Rows_examined 11 Rows_read
+
+--connect (conn,localhost,root,,)
+
+--connection conn
+SET SESSION debug="+d,status_waiting_on_query_cache_mutex_sleep";
+SET DEBUG_SYNC='status_waiting_on_query_cache_mutex SIGNAL thread_ready';
+SEND SELECT number from t where id > 0;
+
+--connection default
+--replace_column 1 ### 3 ### 6 ### 9 ### 10 ### 11 ###
 SHOW PROCESSLIST;
 
+--replace_column 1 ###
+SELECT id, info, state FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id;
+
+--disconnect conn
 DROP TABLE t;
-set GLOBAL query_cache_size=0;
+SET GLOBAL query_cache_size=0;
 
=== modified file 'query_cache_enhance.patch'
--- query_cache_enhance.patch	2011-06-16 01:19:11 +0000
+++ query_cache_enhance.patch	2011-08-03 16:25:35 +0000
@@ -272,27 +272,21 @@
  #ifdef EMBEDDED_LIBRARY
  #include "emb_qcache.h"
  #endif
-@@ -454,7 +629,12 @@
+@@ -454,7 +629,14 @@
    Query_cache_wait_state wait_state(thd, __func__, __FILE__, __LINE__);
    DBUG_ENTER("Query_cache::try_lock");
  
 +  const char* old_proc_info= thd->proc_info;
 +  thd_proc_info(thd,"Waiting on query cache mutex");
    mysql_mutex_lock(&structure_guard_mutex);
-+  DBUG_EXECUTE_IF("status_wait_query_cache_mutex_sleep", {
-+      sleep(5);
++  DEBUG_SYNC(thd, "status_waiting_on_query_cache_mutex");
++  DBUG_EXECUTE_IF("status_waiting_on_query_cache_mutex_sleep", {
++      sleep(1);
 +    });
++  thd->proc_info = old_proc_info;
    while (1)
    {
      if (m_cache_lock_status == Query_cache::UNLOCKED)
-@@ -501,6 +681,7 @@
-     }
-   }
-   mysql_mutex_unlock(&structure_guard_mutex);
-+  thd->proc_info = old_proc_info;
- 
-   DBUG_RETURN(interrupt);
- }
 @@ -1274,6 +1455,8 @@
        unlock();
        DBUG_VOID_RETURN;