Merge lp:~sergei.glushchenko/percona-server/5.1-BT34411-ps-bug1082333 into lp:percona-server/5.1

Proposed by Sergei Glushchenko on 2013-10-14
Status: Merged
Approved by: Alexey Kopytov on 2013-10-25
Approved revision: 578
Merged at revision: 598
Proposed branch: lp:~sergei.glushchenko/percona-server/5.1-BT34411-ps-bug1082333
Merge into: lp:percona-server/5.1
Diff against target: 164 lines (+0/-136)
2 files modified
Percona-Server/sql/sql_connect.cc (+0/-88)
Percona-Server/sql/structs.h (+0/-48)
To merge this branch: bzr merge lp:~sergei.glushchenko/percona-server/5.1-BT34411-ps-bug1082333
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) 2013-10-14 Approve on 2013-10-25
Review via email: mp+190955@code.launchpad.net

Description of the change

To post a comment you must log in.
Alexey Kopytov (akopytov) :
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_connect.cc'
2--- Percona-Server/sql/sql_connect.cc 2013-05-23 09:09:56 +0000
3+++ Percona-Server/sql/sql_connect.cc 2013-10-14 13:45:50 +0000
4@@ -235,94 +235,6 @@
5 DBUG_VOID_RETURN;
6 }
7
8-void add_user_stats(USER_STATS *user_stats,
9- uint total_connections,
10- uint concurrent_connections,
11- time_t connected_time,
12- double busy_time,
13- double cpu_time,
14- ulonglong bytes_received,
15- ulonglong bytes_sent,
16- ulonglong binlog_bytes_written,
17- ha_rows rows_fetched,
18- ha_rows rows_updated,
19- ha_rows rows_read,
20- ulonglong select_commands,
21- ulonglong update_commands,
22- ulonglong other_commands,
23- ulonglong commit_trans,
24- ulonglong rollback_trans,
25- ulonglong denied_connections,
26- ulonglong lost_connections,
27- ulonglong access_denied_errors,
28- ulonglong empty_queries)
29-{
30- user_stats->total_connections += total_connections;
31- user_stats->concurrent_connections += concurrent_connections;
32- user_stats->connected_time += connected_time;
33- user_stats->busy_time += busy_time;
34- user_stats->cpu_time += cpu_time;
35- user_stats->bytes_received += bytes_received;
36- user_stats->bytes_sent += bytes_sent;
37- user_stats->binlog_bytes_written += binlog_bytes_written;
38- user_stats->rows_fetched += rows_fetched;
39- user_stats->rows_updated += rows_updated;
40- user_stats->rows_read += rows_read;
41- user_stats->select_commands += select_commands;
42- user_stats->update_commands += update_commands;
43- user_stats->other_commands += other_commands;
44- user_stats->commit_trans += commit_trans;
45- user_stats->rollback_trans += rollback_trans;
46- user_stats->denied_connections += denied_connections;
47- user_stats->lost_connections += lost_connections;
48- user_stats->access_denied_errors += access_denied_errors;
49- user_stats->empty_queries += empty_queries;
50-}
51-
52-void add_thread_stats(THREAD_STATS *thread_stats,
53- uint total_connections,
54- uint concurrent_connections,
55- time_t connected_time,
56- double busy_time,
57- double cpu_time,
58- ulonglong bytes_received,
59- ulonglong bytes_sent,
60- ulonglong binlog_bytes_written,
61- ha_rows rows_fetched,
62- ha_rows rows_updated,
63- ha_rows rows_read,
64- ulonglong select_commands,
65- ulonglong update_commands,
66- ulonglong other_commands,
67- ulonglong commit_trans,
68- ulonglong rollback_trans,
69- ulonglong denied_connections,
70- ulonglong lost_connections,
71- ulonglong access_denied_errors,
72- ulonglong empty_queries)
73-{
74- thread_stats->total_connections += total_connections;
75- thread_stats->concurrent_connections += concurrent_connections;
76- thread_stats->connected_time += connected_time;
77- thread_stats->busy_time += busy_time;
78- thread_stats->cpu_time += cpu_time;
79- thread_stats->bytes_received += bytes_received;
80- thread_stats->bytes_sent += bytes_sent;
81- thread_stats->binlog_bytes_written += binlog_bytes_written;
82- thread_stats->rows_fetched += rows_fetched;
83- thread_stats->rows_updated += rows_updated;
84- thread_stats->rows_read += rows_read;
85- thread_stats->select_commands += select_commands;
86- thread_stats->update_commands += update_commands;
87- thread_stats->other_commands += other_commands;
88- thread_stats->commit_trans += commit_trans;
89- thread_stats->rollback_trans += rollback_trans;
90- thread_stats->denied_connections += denied_connections;
91- thread_stats->lost_connections += lost_connections;
92- thread_stats->access_denied_errors += access_denied_errors;
93- thread_stats->empty_queries += empty_queries;
94-}
95-
96 void init_global_user_stats(void)
97 {
98 if (hash_init(&global_user_stats, system_charset_info, max_connections,
99
100=== modified file 'Percona-Server/sql/structs.h'
101--- Percona-Server/sql/structs.h 2011-11-24 01:59:48 +0000
102+++ Percona-Server/sql/structs.h 2013-10-14 13:45:50 +0000
103@@ -294,30 +294,6 @@
104 ulonglong access_denied_errors,
105 ulonglong empty_queries);
106
107-/* Increment values of an instance of USER_STATS */
108-extern void
109-add_user_stats(USER_STATS *user_stats,
110- uint total_connections,
111- uint concurrent_connections,
112- time_t connected_time,
113- double busy_time,
114- double cpu_time,
115- ulonglong bytes_received,
116- ulonglong bytes_sent,
117- ulonglong binlog_bytes_written,
118- ha_rows rows_fetched,
119- ha_rows rows_updated,
120- ha_rows rows_read,
121- ulonglong select_commands,
122- ulonglong update_commands,
123- ulonglong other_commands,
124- ulonglong commit_trans,
125- ulonglong rollback_trans,
126- ulonglong denied_connections,
127- ulonglong lost_connections,
128- ulonglong access_denied_errors,
129- ulonglong empty_queries);
130-
131 typedef struct st_thread_stats {
132 my_thread_id id;
133 uint total_connections;
134@@ -368,30 +344,6 @@
135 ulonglong access_denied_errors,
136 ulonglong empty_queries);
137
138-/* Increment values of an instance of THREAD_STATS */
139-extern void
140-add_thread_stats(THREAD_STATS *thread_stats,
141- uint total_connections,
142- uint concurrent_connections,
143- time_t connected_time,
144- double busy_time,
145- double cpu_time,
146- ulonglong bytes_received,
147- ulonglong bytes_sent,
148- ulonglong binlog_bytes_written,
149- ha_rows rows_fetched,
150- ha_rows rows_updated,
151- ha_rows rows_read,
152- ulonglong select_commands,
153- ulonglong update_commands,
154- ulonglong other_commands,
155- ulonglong commit_trans,
156- ulonglong rollback_trans,
157- ulonglong denied_connections,
158- ulonglong lost_connections,
159- ulonglong access_denied_errors,
160- ulonglong empty_queries);
161-
162 typedef struct st_table_stats {
163 char table[NAME_LEN * 2 + 2]; // [db] + '.' + [table] + '\0'
164 ulonglong rows_read, rows_changed;

Subscribers

People subscribed via source and target branches