Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~laurynas-biveinis/percona-server/bug714925-5.1 into lp:percona-server/5.1

  1. bug714925-5.1
  2. Merge into 5.1
Proposed by Laurynas Biveinis
Status: Merged
Merged at revision: 566
Proposed branch: lp:~laurynas-biveinis/percona-server/bug714925-5.1
Merge into: lp:percona-server/5.1
Diff against target: 386 lines (+201/-128)
1 file modified
Percona-Server/sql/sql_show.cc (+201/-128)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/bug714925-5.1
Reviewer Review Type Date Requested Status
Vlad Lesin (community) Approve
Review via email: mp+166637@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Vlad Lesin (vlad-lesin) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Percona-Server/sql/sql_show.cc'
2--- Percona-Server/sql/sql_show.cc 2013-05-23 09:09:56 +0000
3+++ Percona-Server/sql/sql_show.cc 2013-05-31 03:35:59 +0000
4@@ -2407,32 +2407,33 @@
5 for (uint i = 0; i < all_user_stats->records; ++i) {
6 restore_record(table, s->default_values);
7 USER_STATS *user_stats = (USER_STATS*)hash_element(all_user_stats, i);
8- table->field[0]->store(user_stats->user, strlen(user_stats->user), system_charset_info);
9- table->field[1]->store((longlong)user_stats->total_connections);
10- table->field[2]->store((longlong)user_stats->concurrent_connections);
11- table->field[3]->store((longlong)user_stats->connected_time);
12- table->field[4]->store((longlong)user_stats->busy_time);
13- table->field[5]->store((longlong)user_stats->cpu_time);
14- table->field[6]->store((longlong)user_stats->bytes_received);
15- table->field[7]->store((longlong)user_stats->bytes_sent);
16- table->field[8]->store((longlong)user_stats->binlog_bytes_written);
17- table->field[9]->store((longlong)user_stats->rows_fetched);
18- table->field[10]->store((longlong)user_stats->rows_updated);
19- table->field[11]->store((longlong)user_stats->rows_read);
20- table->field[12]->store((longlong)user_stats->select_commands);
21- table->field[13]->store((longlong)user_stats->update_commands);
22- table->field[14]->store((longlong)user_stats->other_commands);
23- table->field[15]->store((longlong)user_stats->commit_trans);
24- table->field[16]->store((longlong)user_stats->rollback_trans);
25- table->field[17]->store((longlong)user_stats->denied_connections);
26- table->field[18]->store((longlong)user_stats->lost_connections);
27- table->field[19]->store((longlong)user_stats->access_denied_errors);
28- table->field[20]->store((longlong)user_stats->empty_queries);
29- if (schema_table_store_record(thd, table))
30- {
31- DBUG_PRINT("error", ("store record error"));
32- DBUG_RETURN(1);
33- }
34+ table->field[0]->store(user_stats->user, strlen(user_stats->user),
35+ system_charset_info);
36+ table->field[1]->store(user_stats->total_connections, true);
37+ table->field[2]->store(user_stats->concurrent_connections, true);
38+ table->field[3]->store(user_stats->connected_time, true);
39+ table->field[4]->store((ulonglong)user_stats->busy_time, true);
40+ table->field[5]->store((ulonglong)user_stats->cpu_time, true);
41+ table->field[6]->store(user_stats->bytes_received, true);
42+ table->field[7]->store(user_stats->bytes_sent, true);
43+ table->field[8]->store(user_stats->binlog_bytes_written, true);
44+ table->field[9]->store(user_stats->rows_fetched, true);
45+ table->field[10]->store(user_stats->rows_updated, true);
46+ table->field[11]->store(user_stats->rows_read, true);
47+ table->field[12]->store(user_stats->select_commands, true);
48+ table->field[13]->store(user_stats->update_commands, true);
49+ table->field[14]->store(user_stats->other_commands, true);
50+ table->field[15]->store(user_stats->commit_trans, true);
51+ table->field[16]->store(user_stats->rollback_trans, true);
52+ table->field[17]->store(user_stats->denied_connections, true);
53+ table->field[18]->store(user_stats->lost_connections, true);
54+ table->field[19]->store(user_stats->access_denied_errors, true);
55+ table->field[20]->store(user_stats->empty_queries, true);
56+ if (schema_table_store_record(thd, table))
57+ {
58+ DBUG_PRINT("error", ("store record error"));
59+ DBUG_RETURN(1);
60+ }
61 }
62 DBUG_RETURN(0);
63 }
64@@ -2442,33 +2443,34 @@
65 DBUG_ENTER("send_thread_stats");
66 for (uint i = 0; i < all_thread_stats->records; ++i) {
67 restore_record(table, s->default_values);
68- THREAD_STATS *user_stats = (THREAD_STATS*)hash_element(all_thread_stats, i);
69- table->field[0]->store((longlong)user_stats->id);
70- table->field[1]->store((longlong)user_stats->total_connections);
71- table->field[2]->store((longlong)user_stats->concurrent_connections);
72- table->field[3]->store((longlong)user_stats->connected_time);
73- table->field[4]->store((longlong)user_stats->busy_time);
74- table->field[5]->store((longlong)user_stats->cpu_time);
75- table->field[6]->store((longlong)user_stats->bytes_received);
76- table->field[7]->store((longlong)user_stats->bytes_sent);
77- table->field[8]->store((longlong)user_stats->binlog_bytes_written);
78- table->field[9]->store((longlong)user_stats->rows_fetched);
79- table->field[10]->store((longlong)user_stats->rows_updated);
80- table->field[11]->store((longlong)user_stats->rows_read);
81- table->field[12]->store((longlong)user_stats->select_commands);
82- table->field[13]->store((longlong)user_stats->update_commands);
83- table->field[14]->store((longlong)user_stats->other_commands);
84- table->field[15]->store((longlong)user_stats->commit_trans);
85- table->field[16]->store((longlong)user_stats->rollback_trans);
86- table->field[17]->store((longlong)user_stats->denied_connections);
87- table->field[18]->store((longlong)user_stats->lost_connections);
88- table->field[19]->store((longlong)user_stats->access_denied_errors);
89- table->field[20]->store((longlong)user_stats->empty_queries);
90- if (schema_table_store_record(thd, table))
91- {
92- DBUG_PRINT("error", ("store record error"));
93- DBUG_RETURN(1);
94- }
95+ THREAD_STATS *user_stats = (THREAD_STATS*)hash_element(all_thread_stats,
96+ i);
97+ table->field[0]->store(user_stats->id, true);
98+ table->field[1]->store(user_stats->total_connections, true);
99+ table->field[2]->store(user_stats->concurrent_connections, true);
100+ table->field[3]->store(user_stats->connected_time, true);
101+ table->field[4]->store((ulonglong)user_stats->busy_time, true);
102+ table->field[5]->store((ulonglong)user_stats->cpu_time, true);
103+ table->field[6]->store(user_stats->bytes_received, true);
104+ table->field[7]->store(user_stats->bytes_sent, true);
105+ table->field[8]->store(user_stats->binlog_bytes_written, true);
106+ table->field[9]->store(user_stats->rows_fetched, true);
107+ table->field[10]->store(user_stats->rows_updated, true);
108+ table->field[11]->store(user_stats->rows_read, true);
109+ table->field[12]->store(user_stats->select_commands, true);
110+ table->field[13]->store(user_stats->update_commands, true);
111+ table->field[14]->store(user_stats->other_commands, true);
112+ table->field[15]->store(user_stats->commit_trans, true);
113+ table->field[16]->store(user_stats->rollback_trans, true);
114+ table->field[17]->store(user_stats->denied_connections, true);
115+ table->field[18]->store(user_stats->lost_connections, true);
116+ table->field[19]->store(user_stats->access_denied_errors, true);
117+ table->field[20]->store(user_stats->empty_queries, true);
118+ if (schema_table_store_record(thd, table))
119+ {
120+ DBUG_PRINT("error", ("store record error"));
121+ DBUG_RETURN(1);
122+ }
123 }
124 DBUG_RETURN(0);
125 }
126@@ -2606,9 +2608,9 @@
127
128 table->field[0]->store(table_schema, strlen(table_schema), system_charset_info);
129 table->field[1]->store(table_full_name, strlen(table_full_name), system_charset_info);
130- table->field[2]->store((longlong)table_stats->rows_read, TRUE);
131- table->field[3]->store((longlong)table_stats->rows_changed, TRUE);
132- table->field[4]->store((longlong)table_stats->rows_changed_x_indexes, TRUE);
133+ table->field[2]->store(table_stats->rows_read, true);
134+ table->field[3]->store(table_stats->rows_changed, true);
135+ table->field[4]->store(table_stats->rows_changed_x_indexes, true);
136
137 if (schema_table_store_record(thd, table))
138 {
139@@ -2651,7 +2653,7 @@
140 table->field[0]->store(table_schema, strlen(table_schema), system_charset_info);
141 table->field[1]->store(table_name, strlen(table_name), system_charset_info);
142 table->field[2]->store(index_full_name, strlen(index_full_name), system_charset_info);
143- table->field[3]->store((longlong)index_stats->rows_read, TRUE);
144+ table->field[3]->store(index_stats->rows_read, true);
145
146 if (schema_table_store_record(thd, table))
147 {
148@@ -7295,97 +7297,168 @@
149 ST_FIELD_INFO user_stats_fields_info[]=
150 {
151 {"USER", USERNAME_LENGTH, MYSQL_TYPE_STRING, 0, 0, "User", SKIP_OPEN_TABLE},
152- {"TOTAL_CONNECTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Total_connections", SKIP_OPEN_TABLE},
153- {"CONCURRENT_CONNECTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Concurrent_connections", SKIP_OPEN_TABLE},
154- {"CONNECTED_TIME", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Connected_time", SKIP_OPEN_TABLE},
155- {"BUSY_TIME", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Busy_time", SKIP_OPEN_TABLE},
156- {"CPU_TIME", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Cpu_time", SKIP_OPEN_TABLE},
157- {"BYTES_RECEIVED", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Bytes_received", SKIP_OPEN_TABLE},
158- {"BYTES_SENT", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Bytes_sent", SKIP_OPEN_TABLE},
159- {"BINLOG_BYTES_WRITTEN", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Binlog_bytes_written", SKIP_OPEN_TABLE},
160- {"ROWS_FETCHED", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Rows_fetched", SKIP_OPEN_TABLE},
161- {"ROWS_UPDATED", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Rows_updated", SKIP_OPEN_TABLE},
162- {"TABLE_ROWS_READ", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Table_rows_read", SKIP_OPEN_TABLE},
163- {"SELECT_COMMANDS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Select_commands", SKIP_OPEN_TABLE},
164- {"UPDATE_COMMANDS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Update_commands", SKIP_OPEN_TABLE},
165- {"OTHER_COMMANDS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Other_commands", SKIP_OPEN_TABLE},
166- {"COMMIT_TRANSACTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Commit_transactions", SKIP_OPEN_TABLE},
167- {"ROLLBACK_TRANSACTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Rollback_transactions", SKIP_OPEN_TABLE},
168- {"DENIED_CONNECTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Denied_connections", SKIP_OPEN_TABLE},
169- {"LOST_CONNECTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Lost_connections", SKIP_OPEN_TABLE},
170- {"ACCESS_DENIED", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Access_denied", SKIP_OPEN_TABLE},
171- {"EMPTY_QUERIES", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Empty_queries", SKIP_OPEN_TABLE},
172+ {"TOTAL_CONNECTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
173+ MY_I_S_UNSIGNED, "Total_connections", SKIP_OPEN_TABLE},
174+ {"CONCURRENT_CONNECTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG,
175+ 0, MY_I_S_UNSIGNED, "Concurrent_connections", SKIP_OPEN_TABLE},
176+ {"CONNECTED_TIME", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
177+ MY_I_S_UNSIGNED, "Connected_time", SKIP_OPEN_TABLE},
178+ {"BUSY_TIME", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
179+ MY_I_S_UNSIGNED, "Busy_time", SKIP_OPEN_TABLE},
180+ {"CPU_TIME", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
181+ MY_I_S_UNSIGNED, "Cpu_time", SKIP_OPEN_TABLE},
182+ {"BYTES_RECEIVED", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
183+ MY_I_S_UNSIGNED, "Bytes_received", SKIP_OPEN_TABLE},
184+ {"BYTES_SENT", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
185+ MY_I_S_UNSIGNED, "Bytes_sent", SKIP_OPEN_TABLE},
186+ {"BINLOG_BYTES_WRITTEN", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG,
187+ 0, MY_I_S_UNSIGNED, "Binlog_bytes_written", SKIP_OPEN_TABLE},
188+ {"ROWS_FETCHED", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
189+ MY_I_S_UNSIGNED, "Rows_fetched", SKIP_OPEN_TABLE},
190+ {"ROWS_UPDATED", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
191+ MY_I_S_UNSIGNED, "Rows_updated", SKIP_OPEN_TABLE},
192+ {"TABLE_ROWS_READ", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
193+ MY_I_S_UNSIGNED, "Table_rows_read", SKIP_OPEN_TABLE},
194+ {"SELECT_COMMANDS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
195+ MY_I_S_UNSIGNED, "Select_commands", SKIP_OPEN_TABLE},
196+ {"UPDATE_COMMANDS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
197+ MY_I_S_UNSIGNED, "Update_commands", SKIP_OPEN_TABLE},
198+ {"OTHER_COMMANDS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
199+ MY_I_S_UNSIGNED, "Other_commands", SKIP_OPEN_TABLE},
200+ {"COMMIT_TRANSACTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
201+ MY_I_S_UNSIGNED, "Commit_transactions", SKIP_OPEN_TABLE},
202+ {"ROLLBACK_TRANSACTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG,
203+ 0, MY_I_S_UNSIGNED, "Rollback_transactions", SKIP_OPEN_TABLE},
204+ {"DENIED_CONNECTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
205+ MY_I_S_UNSIGNED, "Denied_connections", SKIP_OPEN_TABLE},
206+ {"LOST_CONNECTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
207+ MY_I_S_UNSIGNED, "Lost_connections", SKIP_OPEN_TABLE},
208+ {"ACCESS_DENIED", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
209+ MY_I_S_UNSIGNED, "Access_denied", SKIP_OPEN_TABLE},
210+ {"EMPTY_QUERIES", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
211+ MY_I_S_UNSIGNED, "Empty_queries", SKIP_OPEN_TABLE},
212 {0, 0, MYSQL_TYPE_STRING, 0, 0, 0, 0}
213 };
214
215 ST_FIELD_INFO client_stats_fields_info[]=
216 {
217- {"CLIENT", LIST_PROCESS_HOST_LEN, MYSQL_TYPE_STRING, 0, 0, "Client", SKIP_OPEN_TABLE},
218- {"TOTAL_CONNECTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Total_connections", SKIP_OPEN_TABLE},
219- {"CONCURRENT_CONNECTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Concurrent_connections", SKIP_OPEN_TABLE},
220- {"CONNECTED_TIME", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Connected_time", SKIP_OPEN_TABLE},
221- {"BUSY_TIME", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Busy_time", SKIP_OPEN_TABLE},
222- {"CPU_TIME", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Cpu_time", SKIP_OPEN_TABLE},
223- {"BYTES_RECEIVED", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Bytes_received", SKIP_OPEN_TABLE},
224- {"BYTES_SENT", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Bytes_sent", SKIP_OPEN_TABLE},
225- {"BINLOG_BYTES_WRITTEN", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Binlog_bytes_written", SKIP_OPEN_TABLE},
226- {"ROWS_FETCHED", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Rows_fetched", SKIP_OPEN_TABLE},
227- {"ROWS_UPDATED", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Rows_updated", SKIP_OPEN_TABLE},
228- {"TABLE_ROWS_READ", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Table_rows_read", SKIP_OPEN_TABLE},
229- {"SELECT_COMMANDS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Select_commands", SKIP_OPEN_TABLE},
230- {"UPDATE_COMMANDS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Update_commands", SKIP_OPEN_TABLE},
231- {"OTHER_COMMANDS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Other_commands", SKIP_OPEN_TABLE},
232- {"COMMIT_TRANSACTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Commit_transactions", SKIP_OPEN_TABLE},
233- {"ROLLBACK_TRANSACTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Rollback_transactions", SKIP_OPEN_TABLE},
234- {"DENIED_CONNECTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Denied_connections", SKIP_OPEN_TABLE},
235- {"LOST_CONNECTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Lost_connections", SKIP_OPEN_TABLE},
236- {"ACCESS_DENIED", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Access_denied", SKIP_OPEN_TABLE},
237- {"EMPTY_QUERIES", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Empty_queries", SKIP_OPEN_TABLE},
238+ {"CLIENT", LIST_PROCESS_HOST_LEN, MYSQL_TYPE_STRING, 0, 0, "Client",
239+ SKIP_OPEN_TABLE},
240+ {"TOTAL_CONNECTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
241+ MY_I_S_UNSIGNED, "Total_connections", SKIP_OPEN_TABLE},
242+ {"CONCURRENT_CONNECTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG,
243+ 0, MY_I_S_UNSIGNED, "Concurrent_connections", SKIP_OPEN_TABLE},
244+ {"CONNECTED_TIME", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
245+ MY_I_S_UNSIGNED, "Connected_time", SKIP_OPEN_TABLE},
246+ {"BUSY_TIME", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
247+ MY_I_S_UNSIGNED, "Busy_time", SKIP_OPEN_TABLE},
248+ {"CPU_TIME", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
249+ MY_I_S_UNSIGNED, "Cpu_time", SKIP_OPEN_TABLE},
250+ {"BYTES_RECEIVED", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
251+ MY_I_S_UNSIGNED, "Bytes_received", SKIP_OPEN_TABLE},
252+ {"BYTES_SENT", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
253+ MY_I_S_UNSIGNED, "Bytes_sent", SKIP_OPEN_TABLE},
254+ {"BINLOG_BYTES_WRITTEN", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG,
255+ 0, MY_I_S_UNSIGNED, "Binlog_bytes_written", SKIP_OPEN_TABLE},
256+ {"ROWS_FETCHED", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
257+ MY_I_S_UNSIGNED, "Rows_fetched", SKIP_OPEN_TABLE},
258+ {"ROWS_UPDATED", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
259+ MY_I_S_UNSIGNED, "Rows_updated", SKIP_OPEN_TABLE},
260+ {"TABLE_ROWS_READ", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
261+ MY_I_S_UNSIGNED, "Table_rows_read", SKIP_OPEN_TABLE},
262+ {"SELECT_COMMANDS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
263+ MY_I_S_UNSIGNED, "Select_commands", SKIP_OPEN_TABLE},
264+ {"UPDATE_COMMANDS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
265+ MY_I_S_UNSIGNED, "Update_commands", SKIP_OPEN_TABLE},
266+ {"OTHER_COMMANDS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
267+ MY_I_S_UNSIGNED, "Other_commands", SKIP_OPEN_TABLE},
268+ {"COMMIT_TRANSACTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
269+ MY_I_S_UNSIGNED, "Commit_transactions", SKIP_OPEN_TABLE},
270+ {"ROLLBACK_TRANSACTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG,
271+ 0, MY_I_S_UNSIGNED, "Rollback_transactions", SKIP_OPEN_TABLE},
272+ {"DENIED_CONNECTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
273+ MY_I_S_UNSIGNED, "Denied_connections", SKIP_OPEN_TABLE},
274+ {"LOST_CONNECTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
275+ MY_I_S_UNSIGNED, "Lost_connections", SKIP_OPEN_TABLE},
276+ {"ACCESS_DENIED", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
277+ MY_I_S_UNSIGNED, "Access_denied", SKIP_OPEN_TABLE},
278+ {"EMPTY_QUERIES", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
279+ MY_I_S_UNSIGNED, "Empty_queries", SKIP_OPEN_TABLE},
280 {0, 0, MYSQL_TYPE_STRING, 0, 0, 0, 0}
281 };
282
283 ST_FIELD_INFO thread_stats_fields_info[]=
284 {
285- {"THREAD_ID", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Thread_id", SKIP_OPEN_TABLE},
286- {"TOTAL_CONNECTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Total_connections", SKIP_OPEN_TABLE},
287- {"CONCURRENT_CONNECTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Concurrent_connections", SKIP_OPEN_TABLE},
288- {"CONNECTED_TIME", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Connected_time", SKIP_OPEN_TABLE},
289- {"BUSY_TIME", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Busy_time", SKIP_OPEN_TABLE},
290- {"CPU_TIME", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Cpu_time", SKIP_OPEN_TABLE},
291- {"BYTES_RECEIVED", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Bytes_received", SKIP_OPEN_TABLE},
292- {"BYTES_SENT", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Bytes_sent", SKIP_OPEN_TABLE},
293- {"BINLOG_BYTES_WRITTEN", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Binlog_bytes_written", SKIP_OPEN_TABLE},
294- {"ROWS_FETCHED", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Rows_fetched", SKIP_OPEN_TABLE},
295- {"ROWS_UPDATED", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Rows_updated", SKIP_OPEN_TABLE},
296- {"TABLE_ROWS_READ", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Table_rows_read", SKIP_OPEN_TABLE},
297- {"SELECT_COMMANDS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Select_commands", SKIP_OPEN_TABLE},
298- {"UPDATE_COMMANDS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Update_commands", SKIP_OPEN_TABLE},
299- {"OTHER_COMMANDS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Other_commands", SKIP_OPEN_TABLE},
300- {"COMMIT_TRANSACTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Commit_transactions", SKIP_OPEN_TABLE},
301- {"ROLLBACK_TRANSACTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Rollback_transactions", SKIP_OPEN_TABLE},
302- {"DENIED_CONNECTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Denied_connections", SKIP_OPEN_TABLE},
303- {"LOST_CONNECTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Lost_connections", SKIP_OPEN_TABLE},
304- {"ACCESS_DENIED", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Access_denied", SKIP_OPEN_TABLE},
305- {"EMPTY_QUERIES", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Empty_queries", SKIP_OPEN_TABLE},
306+ {"THREAD_ID", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
307+ MY_I_S_UNSIGNED, "Thread_id", SKIP_OPEN_TABLE},
308+ {"TOTAL_CONNECTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
309+ MY_I_S_UNSIGNED, "Total_connections", SKIP_OPEN_TABLE},
310+ {"CONCURRENT_CONNECTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG,
311+ 0, MY_I_S_UNSIGNED, "Concurrent_connections", SKIP_OPEN_TABLE},
312+ {"CONNECTED_TIME", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
313+ MY_I_S_UNSIGNED, "Connected_time", SKIP_OPEN_TABLE},
314+ {"BUSY_TIME", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
315+ MY_I_S_UNSIGNED, "Busy_time", SKIP_OPEN_TABLE},
316+ {"CPU_TIME", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
317+ MY_I_S_UNSIGNED, "Cpu_time", SKIP_OPEN_TABLE},
318+ {"BYTES_RECEIVED", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
319+ MY_I_S_UNSIGNED, "Bytes_received", SKIP_OPEN_TABLE},
320+ {"BYTES_SENT", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
321+ MY_I_S_UNSIGNED, "Bytes_sent", SKIP_OPEN_TABLE},
322+ {"BINLOG_BYTES_WRITTEN", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
323+ MY_I_S_UNSIGNED, "Binlog_bytes_written", SKIP_OPEN_TABLE},
324+ {"ROWS_FETCHED", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
325+ MY_I_S_UNSIGNED, "Rows_fetched", SKIP_OPEN_TABLE},
326+ {"ROWS_UPDATED", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
327+ MY_I_S_UNSIGNED, "Rows_updated", SKIP_OPEN_TABLE},
328+ {"TABLE_ROWS_READ", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
329+ MY_I_S_UNSIGNED, "Table_rows_read", SKIP_OPEN_TABLE},
330+ {"SELECT_COMMANDS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
331+ MY_I_S_UNSIGNED, "Select_commands", SKIP_OPEN_TABLE},
332+ {"UPDATE_COMMANDS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
333+ MY_I_S_UNSIGNED, "Update_commands", SKIP_OPEN_TABLE},
334+ {"OTHER_COMMANDS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
335+ MY_I_S_UNSIGNED, "Other_commands", SKIP_OPEN_TABLE},
336+ {"COMMIT_TRANSACTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
337+ MY_I_S_UNSIGNED, "Commit_transactions", SKIP_OPEN_TABLE},
338+ {"ROLLBACK_TRANSACTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG,
339+ 0, MY_I_S_UNSIGNED, "Rollback_transactions", SKIP_OPEN_TABLE},
340+ {"DENIED_CONNECTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
341+ MY_I_S_UNSIGNED, "Denied_connections", SKIP_OPEN_TABLE},
342+ {"LOST_CONNECTIONS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
343+ MY_I_S_UNSIGNED, "Lost_connections", SKIP_OPEN_TABLE},
344+ {"ACCESS_DENIED", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
345+ MY_I_S_UNSIGNED, "Access_denied", SKIP_OPEN_TABLE},
346+ {"EMPTY_QUERIES", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
347+ MY_I_S_UNSIGNED, "Empty_queries", SKIP_OPEN_TABLE},
348 {0, 0, MYSQL_TYPE_STRING, 0, 0, 0, 0}
349 };
350
351 ST_FIELD_INFO table_stats_fields_info[]=
352 {
353- {"TABLE_SCHEMA", NAME_LEN, MYSQL_TYPE_STRING, 0, 0, "Table_schema", SKIP_OPEN_TABLE},
354- {"TABLE_NAME", NAME_LEN, MYSQL_TYPE_STRING, 0, 0, "Table_name", SKIP_OPEN_TABLE},
355- {"ROWS_READ", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Rows_read", SKIP_OPEN_TABLE},
356- {"ROWS_CHANGED", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Rows_changed", SKIP_OPEN_TABLE},
357- {"ROWS_CHANGED_X_INDEXES", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Rows_changed_x_#indexes", SKIP_OPEN_TABLE},
358+ {"TABLE_SCHEMA", NAME_LEN, MYSQL_TYPE_STRING, 0, 0, "Table_schema",
359+ SKIP_OPEN_TABLE},
360+ {"TABLE_NAME", NAME_LEN, MYSQL_TYPE_STRING, 0, 0, "Table_name",
361+ SKIP_OPEN_TABLE},
362+ {"ROWS_READ", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
363+ MY_I_S_UNSIGNED, "Rows_read", SKIP_OPEN_TABLE},
364+ {"ROWS_CHANGED", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
365+ MY_I_S_UNSIGNED, "Rows_changed", SKIP_OPEN_TABLE},
366+ {"ROWS_CHANGED_X_INDEXES", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG,
367+ 0, MY_I_S_UNSIGNED, "Rows_changed_x_#indexes", SKIP_OPEN_TABLE},
368 {0, 0, MYSQL_TYPE_STRING, 0, 0, 0, 0}
369 };
370
371 ST_FIELD_INFO index_stats_fields_info[]=
372 {
373- {"TABLE_SCHEMA", NAME_LEN, MYSQL_TYPE_STRING, 0, 0, "Table_schema", SKIP_OPEN_TABLE},
374- {"TABLE_NAME", NAME_LEN, MYSQL_TYPE_STRING, 0, 0, "Table_name", SKIP_OPEN_TABLE},
375- {"INDEX_NAME", NAME_LEN, MYSQL_TYPE_STRING, 0, 0, "Index_name", SKIP_OPEN_TABLE},
376- {"ROWS_READ", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, "Rows_read", SKIP_OPEN_TABLE},
377+ {"TABLE_SCHEMA", NAME_LEN, MYSQL_TYPE_STRING, 0, 0, "Table_schema",
378+ SKIP_OPEN_TABLE},
379+ {"TABLE_NAME", NAME_LEN, MYSQL_TYPE_STRING, 0, 0, "Table_name",
380+ SKIP_OPEN_TABLE},
381+ {"INDEX_NAME", NAME_LEN, MYSQL_TYPE_STRING, 0, 0, "Index_name",
382+ SKIP_OPEN_TABLE},
383+ {"ROWS_READ", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
384+ MY_I_S_UNSIGNED, "Rows_read", SKIP_OPEN_TABLE},
385 {0, 0, MYSQL_TYPE_STRING, 0, 0, 0, 0}
386 };
387

Subscribers

People subscribed via source and target branches