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

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

  1. 5.1-BT34411-ps-bug1082333
  2. Merge into 5.1
Proposed by Sergei Glushchenko
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
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) Approve
Review via email: mp+190955@code.launchpad.net

Description of the change

Remove redundant code
http://jenkins.percona.com/view/PS%205.1/job/percona-server-5.1-param/575/

To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Percona-Server/sql/sql_connect.cc'
--- Percona-Server/sql/sql_connect.cc 2013-05-23 09:09:56 +0000
+++ Percona-Server/sql/sql_connect.cc 2013-10-14 13:45:50 +0000
@@ -235,94 +235,6 @@
235 DBUG_VOID_RETURN;235 DBUG_VOID_RETURN;
236}236}
237237
238void add_user_stats(USER_STATS *user_stats,
239 uint total_connections,
240 uint concurrent_connections,
241 time_t connected_time,
242 double busy_time,
243 double cpu_time,
244 ulonglong bytes_received,
245 ulonglong bytes_sent,
246 ulonglong binlog_bytes_written,
247 ha_rows rows_fetched,
248 ha_rows rows_updated,
249 ha_rows rows_read,
250 ulonglong select_commands,
251 ulonglong update_commands,
252 ulonglong other_commands,
253 ulonglong commit_trans,
254 ulonglong rollback_trans,
255 ulonglong denied_connections,
256 ulonglong lost_connections,
257 ulonglong access_denied_errors,
258 ulonglong empty_queries)
259{
260 user_stats->total_connections += total_connections;
261 user_stats->concurrent_connections += concurrent_connections;
262 user_stats->connected_time += connected_time;
263 user_stats->busy_time += busy_time;
264 user_stats->cpu_time += cpu_time;
265 user_stats->bytes_received += bytes_received;
266 user_stats->bytes_sent += bytes_sent;
267 user_stats->binlog_bytes_written += binlog_bytes_written;
268 user_stats->rows_fetched += rows_fetched;
269 user_stats->rows_updated += rows_updated;
270 user_stats->rows_read += rows_read;
271 user_stats->select_commands += select_commands;
272 user_stats->update_commands += update_commands;
273 user_stats->other_commands += other_commands;
274 user_stats->commit_trans += commit_trans;
275 user_stats->rollback_trans += rollback_trans;
276 user_stats->denied_connections += denied_connections;
277 user_stats->lost_connections += lost_connections;
278 user_stats->access_denied_errors += access_denied_errors;
279 user_stats->empty_queries += empty_queries;
280}
281
282void add_thread_stats(THREAD_STATS *thread_stats,
283 uint total_connections,
284 uint concurrent_connections,
285 time_t connected_time,
286 double busy_time,
287 double cpu_time,
288 ulonglong bytes_received,
289 ulonglong bytes_sent,
290 ulonglong binlog_bytes_written,
291 ha_rows rows_fetched,
292 ha_rows rows_updated,
293 ha_rows rows_read,
294 ulonglong select_commands,
295 ulonglong update_commands,
296 ulonglong other_commands,
297 ulonglong commit_trans,
298 ulonglong rollback_trans,
299 ulonglong denied_connections,
300 ulonglong lost_connections,
301 ulonglong access_denied_errors,
302 ulonglong empty_queries)
303{
304 thread_stats->total_connections += total_connections;
305 thread_stats->concurrent_connections += concurrent_connections;
306 thread_stats->connected_time += connected_time;
307 thread_stats->busy_time += busy_time;
308 thread_stats->cpu_time += cpu_time;
309 thread_stats->bytes_received += bytes_received;
310 thread_stats->bytes_sent += bytes_sent;
311 thread_stats->binlog_bytes_written += binlog_bytes_written;
312 thread_stats->rows_fetched += rows_fetched;
313 thread_stats->rows_updated += rows_updated;
314 thread_stats->rows_read += rows_read;
315 thread_stats->select_commands += select_commands;
316 thread_stats->update_commands += update_commands;
317 thread_stats->other_commands += other_commands;
318 thread_stats->commit_trans += commit_trans;
319 thread_stats->rollback_trans += rollback_trans;
320 thread_stats->denied_connections += denied_connections;
321 thread_stats->lost_connections += lost_connections;
322 thread_stats->access_denied_errors += access_denied_errors;
323 thread_stats->empty_queries += empty_queries;
324}
325
326void init_global_user_stats(void)238void init_global_user_stats(void)
327{239{
328 if (hash_init(&global_user_stats, system_charset_info, max_connections,240 if (hash_init(&global_user_stats, system_charset_info, max_connections,
329241
=== modified file 'Percona-Server/sql/structs.h'
--- Percona-Server/sql/structs.h 2011-11-24 01:59:48 +0000
+++ Percona-Server/sql/structs.h 2013-10-14 13:45:50 +0000
@@ -294,30 +294,6 @@
294 ulonglong access_denied_errors,294 ulonglong access_denied_errors,
295 ulonglong empty_queries);295 ulonglong empty_queries);
296296
297/* Increment values of an instance of USER_STATS */
298extern void
299add_user_stats(USER_STATS *user_stats,
300 uint total_connections,
301 uint concurrent_connections,
302 time_t connected_time,
303 double busy_time,
304 double cpu_time,
305 ulonglong bytes_received,
306 ulonglong bytes_sent,
307 ulonglong binlog_bytes_written,
308 ha_rows rows_fetched,
309 ha_rows rows_updated,
310 ha_rows rows_read,
311 ulonglong select_commands,
312 ulonglong update_commands,
313 ulonglong other_commands,
314 ulonglong commit_trans,
315 ulonglong rollback_trans,
316 ulonglong denied_connections,
317 ulonglong lost_connections,
318 ulonglong access_denied_errors,
319 ulonglong empty_queries);
320
321typedef struct st_thread_stats {297typedef struct st_thread_stats {
322 my_thread_id id;298 my_thread_id id;
323 uint total_connections;299 uint total_connections;
@@ -368,30 +344,6 @@
368 ulonglong access_denied_errors,344 ulonglong access_denied_errors,
369 ulonglong empty_queries);345 ulonglong empty_queries);
370346
371/* Increment values of an instance of THREAD_STATS */
372extern void
373add_thread_stats(THREAD_STATS *thread_stats,
374 uint total_connections,
375 uint concurrent_connections,
376 time_t connected_time,
377 double busy_time,
378 double cpu_time,
379 ulonglong bytes_received,
380 ulonglong bytes_sent,
381 ulonglong binlog_bytes_written,
382 ha_rows rows_fetched,
383 ha_rows rows_updated,
384 ha_rows rows_read,
385 ulonglong select_commands,
386 ulonglong update_commands,
387 ulonglong other_commands,
388 ulonglong commit_trans,
389 ulonglong rollback_trans,
390 ulonglong denied_connections,
391 ulonglong lost_connections,
392 ulonglong access_denied_errors,
393 ulonglong empty_queries);
394
395typedef struct st_table_stats {347typedef struct st_table_stats {
396 char table[NAME_LEN * 2 + 2]; // [db] + '.' + [table] + '\0'348 char table[NAME_LEN * 2 + 2]; // [db] + '.' + [table] + '\0'
397 ulonglong rows_read, rows_changed;349 ulonglong rows_read, rows_changed;

Subscribers

People subscribed via source and target branches