Added new states to be able to better diagnose where server hangs.

- Table locks now ends with state "After table lock"
- Open table now ends with state "After opening tables"
- All calls to close_thread_tables(), not only from mysql_execute_command(), has state "closing tables"
- Added state "executing" for mysql admin commands, like CACHE INDEX, REPAIR TABLE etc.
- Added state "Finding key cache" for CACHE INDEX
- Added state "Filling schema table" when we generate temporary table for SHOW commands and information schema.

Other things:
Add limit from innobase for thread_sleep_delay. This fixed a failing tests case.
Added db.opt to support-files to make 'make package' work


mysql-test/suite/funcs_1/datadict/processlist_val.inc:
  Use new state
mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result:
  Updated test result because of new state
mysql-test/suite/funcs_1/r/processlist_val_no_prot.result:
  Updated test result because of new state
sql/CMakeLists.txt:
  Have option files in support-files
sql/lock.cc:
  Added new state 'After table lock'
sql/sql_admin.cc:
  Added state "executing" and "Sending data" for mysql admin commands, like CACHE INDEX, REPAIR TABLE etc.
  Added state "Finding key cache"
sql/sql_base.cc:
  open tables now ends with state "After table lock", instead of NULL
sql/sql_parse.cc:
  Moved state "closing tables" to close_thread_tables()
sql/sql_show.cc:
  Added state "Filling schema table" when we generate temporary table for SHOW commands and information schema.
storage/xtradb/buf/buf0buf.c:
  Removed compiler warning
storage/xtradb/handler/ha_innodb.cc:
  Add limit from innobase for thread_sleep_delay. This fixed a failing tests case.
support-files/db.opt:
  cmakes needs this to create data/test directory

12 files changed, 44 insertions, 31 deletions

diff --git a/mysql-test/suite/funcs_1/datadict/processlist_val.inc b/mysql-test/suite/funcs_1/datadict/processlist_val.inc
index bb6c13a6f4b..dbc5ebd51b7 100644
--- a/mysql-test/suite/funcs_1/datadict/processlist_val.inc
+++ b/mysql-test/suite/funcs_1/datadict/processlist_val.inc
@@ -89,7 +89,7 @@ echo
 #   - TIME (printed value will be unified), the exact values are like
 #          "normal" load: 0 (seconds)
 #          "heavy" load: 1 or more (seconds)
-#   - State 'executing'
+#   - State 'Filling schema table'
 #   - INFO must contain the corresponding SHOW/SELECT PROCESSLIST
 #
 # 1. Just dump what we get
@@ -109,7 +109,7 @@ FROM INFORMATION_SCHEMA.PROCESSLIST WHERE ID = @default_id;
 SELECT COUNT(*)  = 1 AS "Expect 1"
 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE ID = @default_id
      AND USER = 'root' AND DB = 'test' AND Command IN('Query','Execute')
-     AND State = 'executing';
+     AND State = 'Filling schema table';
 #
 # 4. Change the DB
 USE information_schema;
diff --git a/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result b/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
index 17009f79662..762df8e4432 100644
--- a/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
+++ b/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
@@ -41,11 +41,11 @@ ID	root	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-ID	root	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM processlist  ORDER BY id	TIME_MS	0	0	0.000
+ID	root	HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM processlist  ORDER BY id	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-ID	root	HOST_NAME	information_schema	Query	TIME	executing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS FROM processlist  ORDER BY id	TIME_MS	0	0	0.000
+ID	root	HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS FROM processlist  ORDER BY id	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 CREATE TEMPORARY TABLE test.t_processlist AS SELECT * FROM processlist;
 UPDATE test.t_processlist SET user='horst' WHERE id=1  ;
@@ -113,10 +113,10 @@ Id	User	Host	db	Command	Time	State	Info	Progress
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM processlist  ORDER BY id	TIME_MS	0	0	0.000
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM processlist  ORDER BY id	TIME_MS	0	0	0.000
 SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	executing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS FROM processlist  ORDER BY id	TIME_MS	0	0	0.000
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS FROM processlist  ORDER BY id	TIME_MS	0	0	0.000
 CREATE TEMPORARY TABLE test.t_processlist AS SELECT * FROM processlist;
 UPDATE test.t_processlist SET user='horst' WHERE id=1  ;
 INSERT INTO processlist SELECT * FROM test.t_processlist;
@@ -176,7 +176,7 @@ Id	User	Host	db	Command	Time	State	Info	Progress
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
 ####################################################################################
 4.2 New connection con101 (ddicttestuser1 with PROCESS privilege)
 SHOW/SELECT shows all processes/threads.
@@ -191,7 +191,7 @@ ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ID	root	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ####################################################################################
@@ -215,7 +215,7 @@ ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID		HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-ID		HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
+ID		HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ID	root	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
@@ -239,7 +239,7 @@ ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ####################################################################################
@@ -257,7 +257,7 @@ Grants for @localhost
 GRANT USAGE ON *.* TO ''@'localhost'
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-ID		HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
+ID		HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
 ID		HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ####################################################################################
 8 Grant SUPER (does not imply PROCESS) privilege to ddicttestuser1
@@ -279,7 +279,7 @@ ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
@@ -305,7 +305,7 @@ ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
@@ -359,7 +359,7 @@ ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
+ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
@@ -388,7 +388,7 @@ ID	ddicttestuser2	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
+ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
 ID	ddicttestuser2	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ####################################################################################
 11.2 Revoke SUPER,PROCESS,GRANT OPTION privilege from user ddicttestuser1
@@ -417,7 +417,7 @@ ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
@@ -453,7 +453,7 @@ ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
diff --git a/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result b/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
index 4f174318f58..d62165a86c2 100644
--- a/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
+++ b/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
@@ -30,7 +30,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
 
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-<ID>	root	<HOST_NAME>	test	Query	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000
+<ID>	root	<HOST_NAME>	test	Query	<TIME>	Filling schema table	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
 <ID>	root	<HOST_NAME>	test	Query	<TIME>	NULL	SHOW FULL PROCESSLIST	<TIME_MS>
@@ -42,7 +42,7 @@ Expect exact one connection with this id
 SELECT COUNT(*)  = 1 AS "Expect 1"
 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE ID = @default_id
 AND USER = 'root' AND DB = 'test' AND Command IN('Query','Execute')
-AND State = 'executing';
+AND State = 'Filling schema table';
 Expect 1
 1
 USE information_schema;
@@ -78,7 +78,7 @@ Has TIME a reasonable value?
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL	<TIME_MS>	0	0	0.000
-<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000
+<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	Filling schema table	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
 <ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST	0.000
@@ -111,7 +111,7 @@ Expect 1
 
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000
+<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	Filling schema table	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
 <ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST	0.000
@@ -128,7 +128,7 @@ Id	User	Host	db	Command	Time	State	Info	Progress
 
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000
+<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	Filling schema table	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL	<TIME_MS>	0	0	0.000
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
@@ -156,7 +156,7 @@ SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
 <ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	User sleep	SELECT sleep(10), 17	<TIME_MS>	0	0	0.000
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL	<TIME_MS>	0	0	0.000
-<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000
+<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	Filling schema table	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
 <ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST	0.000
@@ -203,7 +203,7 @@ SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
 <ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	Waiting for table metadata lock	SELECT COUNT(*) FROM test.t1	<TIME_MS>	0	0	0.000
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL	<TIME_MS>	0	0	0.000
-<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000
+<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	Filling schema table	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000
 UNLOCK TABLES;
 # ----- switch to connection con2 (user = test_user) -----
 
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index 709306e8073..376f9773ab2 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -271,7 +271,7 @@ ADD_CUSTOM_TARGET(distclean
 IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
 
 # Copy db.opt into data/test/
-SET(DBOPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/db.opt ) 
+SET(DBOPT_FILE ${CMAKE_SOURCE_DIR}/support-files/db.opt ) 
 INSTALL(FILES ${DBOPT_FILE} DESTINATION data/test COMPONENT DataFiles)
 
 # Install initial database on windows
diff --git a/sql/lock.cc b/sql/lock.cc
index 3a1a6d41ce3..31ef1314f5a 100644
--- a/sql/lock.cc
+++ b/sql/lock.cc
@@ -323,7 +323,7 @@ bool mysql_lock_tables(THD *thd, MYSQL_LOCK *sql_lock, uint flags)
     (void) unlock_external(thd, sql_lock->table, sql_lock->table_count);
 
 end:
-  thd_proc_info(thd, 0);
+  thd_proc_info(thd, "After table lock");
 
   if (thd->killed)
   {
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc
index 9beeca06945..92aa414b569 100644
--- a/sql/sql_admin.cc
+++ b/sql/sql_admin.cc
@@ -647,7 +647,9 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
     }
 
     DBUG_PRINT("admin", ("calling operator_func '%s'", operator_name));
+    thd_proc_info(thd, "executing");
     result_code = (table->table->file->*operator_func)(thd, check_opt);
+    thd_proc_info(thd, "Sending data");
     DBUG_PRINT("admin", ("operator_func returned: %d", result_code));
 
     if (result_code == HA_ADMIN_NOT_IMPLEMENTED && need_repair_or_alter)
@@ -769,8 +771,9 @@ send_result_message:
         "Table does not support optimize, doing recreate + analyze instead"),
         system_charset_info);
       }
-     if (protocol->write())
+      if (protocol->write())
         goto err;
+      thd_proc_info(thd, "recreating table");
       DBUG_PRINT("info", ("HA_ADMIN_TRY_ALTER, trying analyze..."));
       TABLE_LIST *save_next_local= table->next_local,
                  *save_next_global= table->next_global;
@@ -975,6 +978,7 @@ bool mysql_assign_to_keycache(THD* thd, TABLE_LIST* tables,
   KEY_CACHE *key_cache;
   DBUG_ENTER("mysql_assign_to_keycache");
 
+  thd_proc_info(thd, "Finding key cache");
   check_opt.init();
   mysql_mutex_lock(&LOCK_global_system_variables);
   if (!(key_cache= get_key_cache(key_cache_name)))
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index a0a52d3815f..3eefd8e8835 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -1467,6 +1467,8 @@ void close_thread_tables(THD *thd)
   TABLE *table;
   DBUG_ENTER("close_thread_tables");
 
+  thd_proc_info(thd, "closing tables");
+
 #ifdef EXTRA_DEBUG
   DBUG_PRINT("tcache", ("open tables:"));
   for (table= thd->open_tables; table; table= table->next)
@@ -5170,7 +5172,7 @@ restart:
   }
 
 err:
-  thd_proc_info(thd, 0);
+  thd_proc_info(thd, "After opening tables");
   free_root(&new_frm_mem, MYF(0));              // Free pre-alloced block
 
   if (error && *table_to_open)
@@ -5619,7 +5621,7 @@ end:
       trans_rollback_stmt(thd);
     close_thread_tables(thd);
   }
-  thd_proc_info(thd, 0);
+  thd_proc_info(thd, "After opening table");
   DBUG_RETURN(table);
 }
 
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 61c822f0d69..d6aebf50a70 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -4579,7 +4579,6 @@ finish:
   }
 
   /* Free tables */
-  thd_proc_info(thd, "closing tables");
   close_thread_tables(thd);
   thd_proc_info(thd, 0);
 
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index e07a904d416..97731be6bba 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -7651,10 +7651,13 @@ bool get_schema_tables_result(JOIN *join,
   THD *thd= join->thd;
   LEX *lex= thd->lex;
   bool result= 0;
+  const char *old_proc_info;
   DBUG_ENTER("get_schema_tables_result");
 
   Warnings_only_error_handler err_handler;
   thd->push_internal_handler(&err_handler);
+  old_proc_info= thd_proc_info(thd, "Filling schema table");
+
   for (JOIN_TAB *tab= first_linear_tab(join, WITH_CONST_TABLES); 
        tab; 
        tab= next_linear_tab(join, tab, WITHOUT_BUSH_ROOTS))
@@ -7743,6 +7746,7 @@ bool get_schema_tables_result(JOIN *join,
   }
   else if (result)
     my_error(ER_UNKNOWN_ERROR, MYF(0));
+  thd_proc_info(thd, old_proc_info);
   DBUG_RETURN(result);
 }
 
diff --git a/storage/xtradb/buf/buf0buf.c b/storage/xtradb/buf/buf0buf.c
index efecef4cece..ac5b4b0c4fd 100644
--- a/storage/xtradb/buf/buf0buf.c
+++ b/storage/xtradb/buf/buf0buf.c
@@ -2537,7 +2537,9 @@ loop:
 		rw_lock_s_unlock(&buf_pool->page_hash_latch);
 	}
 
+#if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG
 loop2:
+#endif
 	if (block && buf_pool_watch_is_sentinel(buf_pool, &block->page)) {
 		mutex_exit(block_mutex);
 		block = NULL;
diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc
index 0dae2f14c8d..bf91af6d673 100644
--- a/storage/xtradb/handler/ha_innodb.cc
+++ b/storage/xtradb/handler/ha_innodb.cc
@@ -13281,7 +13281,7 @@ static MYSQL_SYSVAR_ULONG(thread_concurrency, srv_thread_concurrency,
 static MYSQL_SYSVAR_ULONG(thread_sleep_delay, srv_thread_sleep_delay,
   PLUGIN_VAR_RQCMDARG,
   "Time of innodb thread sleeping before joining InnoDB queue (usec). Value 0 disable a sleep",
-  NULL, NULL, 10000L, 0L, ~0UL, 0);
+  NULL, NULL, 10000L, 0L, 1000000L, 0);
 
 static MYSQL_SYSVAR_STR(data_file_path, innobase_data_file_path,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
diff --git a/support-files/db.opt b/support-files/db.opt
new file mode 100644
index 00000000000..d8429c4e0de
--- /dev/null
+++ b/support-files/db.opt
@@ -0,0 +1,2 @@
+default-character-set=latin1
+default-collation=latin1_swedish_ci