|
102.1.1
by kinoyasu
add header and rule, as the first step of the reordering patch for separate release |
1 |
# name : microsec_process.patch |
2 |
# introduced : 11 or before |
|
3 |
# maintainer : Yasufumi |
|
4 |
# |
|
5 |
#!!! notice !!! |
|
6 |
# Any small change to this file in the main branch |
|
7 |
# should be done or reviewed by the maintainer! |
|
|
106
by kinoyasu
Port Yasufumi maintaining patches to 5.1.50: |
8 |
diff -ruN a/patch_info/microsec_process.info b/patch_info/microsec_process.info
|
9 |
--- /dev/null 1970-01-01 09:00:00.000000000 +0900
|
|
10 |
+++ b/patch_info/microsec_process.info 2010-08-27 14:45:52.941058849 +0900
|
|
|
1
by kinoyasu
merge, reorder and port patches based on mysql 5.1.46 innodb 1.0.7 |
11 |
@@ -0,0 +1,8 @@
|
12 |
+File=microsec_process.patch
|
|
13 |
+Name=Adds INFOMATION_SCHEMA.PROCESSLIST with TIME_MS column
|
|
14 |
+Version=1.0
|
|
15 |
+Author=Percona <info@percona.com>
|
|
16 |
+License=GPL
|
|
17 |
+Comment=
|
|
18 |
+2010-01
|
|
19 |
+Ported to 5.1.42
|
|
|
106
by kinoyasu
Port Yasufumi maintaining patches to 5.1.50: |
20 |
diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
|
21 |
--- a/sql/sql_show.cc 2010-08-27 14:38:08.781057666 +0900
|
|
22 |
+++ b/sql/sql_show.cc 2010-08-27 14:45:52.946058726 +0900
|
|
23 |
@@ -1919,7 +1919,8 @@
|
|
|
1
by kinoyasu
merge, reorder and port patches based on mysql 5.1.46 innodb 1.0.7 |
24 |
TABLE *table= tables->table; |
25 |
CHARSET_INFO *cs= system_charset_info; |
|
26 |
char *user; |
|
27 |
- time_t now= my_time(0);
|
|
28 |
+ time_t now;
|
|
29 |
+ ulonglong now_utime= my_micro_time_and_time(&now);
|
|
30 |
DBUG_ENTER("fill_process_list");
|
|
31 |
||
32 |
user= thd->security_ctx->master_access & PROCESS_ACL ? |
|
|
106
by kinoyasu
Port Yasufumi maintaining patches to 5.1.50: |
33 |
@@ -2024,6 +2025,10 @@
|
|
1
by kinoyasu
merge, reorder and port patches based on mysql 5.1.46 innodb 1.0.7 |
34 |
} |
35 |
pthread_mutex_unlock(&tmp->LOCK_thd_data); |
|
36 |
||
37 |
+ /* TIME_MS */
|
|
38 |
+ table->field[8]->store(((tmp->start_utime ?
|
|
39 |
+ now_utime - tmp->start_utime : 0)/ 1000));
|
|
40 |
+
|
|
41 |
if (schema_table_store_record(thd, table)) |
|
42 |
{
|
|
43 |
VOID(pthread_mutex_unlock(&LOCK_thread_count)); |
|
|
106
by kinoyasu
Port Yasufumi maintaining patches to 5.1.50: |
44 |
@@ -6695,6 +6700,8 @@
|
|
1
by kinoyasu
merge, reorder and port patches based on mysql 5.1.46 innodb 1.0.7 |
45 |
{"STATE", 64, MYSQL_TYPE_STRING, 0, 1, "State", SKIP_OPEN_TABLE},
|
46 |
{"INFO", PROCESS_LIST_INFO_WIDTH, MYSQL_TYPE_STRING, 0, 1, "Info",
|
|
47 |
SKIP_OPEN_TABLE}, |
|
48 |
+ {"TIME_MS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG,
|
|
49 |
+ 0, 0, "Time_ms", SKIP_OPEN_TABLE},
|
|
50 |
{0, 0, MYSQL_TYPE_STRING, 0, 0, 0, SKIP_OPEN_TABLE}
|
|
51 |
}; |
|
52 |