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

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

  1. bug714925-5.5
  2. Merge into 5.5
Proposed by Laurynas Biveinis
Status: Merged
Merged at revision: 529
Proposed branch: lp:~laurynas-biveinis/percona-server/bug714925-5.5
Merge into: lp:percona-server/5.5
Diff against target: 401 lines (+210/-134)
1 file modified
Percona-Server/sql/sql_show.cc (+210/-134)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/bug714925-5.5
Reviewer Review Type Date Requested Status
Vlad Lesin (community) Approve
Review via email: mp+166638@code.launchpad.net

Description of the change

Merge bug 714925 fix to 5.5.
ST 32205
http://jenkins.percona.com/job/percona-server-5.5-param/752/

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

Subscribers

People subscribed via source and target branches