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

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

  1. 5.5-BT34411-ps-bug1082333
  2. Merge into 5.5
Proposed by Sergei Glushchenko
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 592
Proposed branch: lp:~sergei.glushchenko/percona-server/5.5-BT34411-ps-bug1082333
Merge into: lp:percona-server/5.5
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.5-BT34411-ps-bug1082333
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+190956@code.launchpad.net

Description of the change

Remove redundant code
http://jenkins.percona.com/view/PS%205.5/job/percona-server-5.5-param/868/

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-06-01 15:04:43 +0000
+++ Percona-Server/sql/sql_connect.cc 2013-10-14 13:46:40 +0000
@@ -265,94 +265,6 @@
265 DBUG_VOID_RETURN;265 DBUG_VOID_RETURN;
266}266}
267267
268void add_user_stats(USER_STATS *user_stats,
269 uint total_connections,
270 uint concurrent_connections,
271 time_t connected_time,
272 double busy_time,
273 double cpu_time,
274 ulonglong bytes_received,
275 ulonglong bytes_sent,
276 ulonglong binlog_bytes_written,
277 ha_rows rows_fetched,
278 ha_rows rows_updated,
279 ha_rows rows_read,
280 ulonglong select_commands,
281 ulonglong update_commands,
282 ulonglong other_commands,
283 ulonglong commit_trans,
284 ulonglong rollback_trans,
285 ulonglong denied_connections,
286 ulonglong lost_connections,
287 ulonglong access_denied_errors,
288 ulonglong empty_queries)
289{
290 user_stats->total_connections+= total_connections;
291 user_stats->concurrent_connections+= concurrent_connections;
292 user_stats->connected_time+= connected_time;
293 user_stats->busy_time+= busy_time;
294 user_stats->cpu_time+= cpu_time;
295 user_stats->bytes_received+= bytes_received;
296 user_stats->bytes_sent+= bytes_sent;
297 user_stats->binlog_bytes_written+= binlog_bytes_written;
298 user_stats->rows_fetched+= rows_fetched;
299 user_stats->rows_updated+= rows_updated;
300 user_stats->rows_read+= rows_read;
301 user_stats->select_commands+= select_commands;
302 user_stats->update_commands+= update_commands;
303 user_stats->other_commands+= other_commands;
304 user_stats->commit_trans+= commit_trans;
305 user_stats->rollback_trans+= rollback_trans;
306 user_stats->denied_connections+= denied_connections;
307 user_stats->lost_connections+= lost_connections;
308 user_stats->access_denied_errors+= access_denied_errors;
309 user_stats->empty_queries+= empty_queries;
310}
311
312void add_thread_stats(THREAD_STATS *thread_stats,
313 uint total_connections,
314 uint concurrent_connections,
315 time_t connected_time,
316 double busy_time,
317 double cpu_time,
318 ulonglong bytes_received,
319 ulonglong bytes_sent,
320 ulonglong binlog_bytes_written,
321 ha_rows rows_fetched,
322 ha_rows rows_updated,
323 ha_rows rows_read,
324 ulonglong select_commands,
325 ulonglong update_commands,
326 ulonglong other_commands,
327 ulonglong commit_trans,
328 ulonglong rollback_trans,
329 ulonglong denied_connections,
330 ulonglong lost_connections,
331 ulonglong access_denied_errors,
332 ulonglong empty_queries)
333{
334 thread_stats->total_connections+= total_connections;
335 thread_stats->concurrent_connections+= concurrent_connections;
336 thread_stats->connected_time+= connected_time;
337 thread_stats->busy_time+= busy_time;
338 thread_stats->cpu_time+= cpu_time;
339 thread_stats->bytes_received+= bytes_received;
340 thread_stats->bytes_sent+= bytes_sent;
341 thread_stats->binlog_bytes_written+= binlog_bytes_written;
342 thread_stats->rows_fetched+= rows_fetched;
343 thread_stats->rows_updated+= rows_updated;
344 thread_stats->rows_read+= rows_read;
345 thread_stats->select_commands+= select_commands;
346 thread_stats->update_commands+= update_commands;
347 thread_stats->other_commands+= other_commands;
348 thread_stats->commit_trans+= commit_trans;
349 thread_stats->rollback_trans+= rollback_trans;
350 thread_stats->denied_connections+= denied_connections;
351 thread_stats->lost_connections+= lost_connections;
352 thread_stats->access_denied_errors+= access_denied_errors;
353 thread_stats->empty_queries+= empty_queries;
354}
355
356void init_global_user_stats(void)268void init_global_user_stats(void)
357{269{
358 if (my_hash_init(&global_user_stats, system_charset_info, max_connections,270 if (my_hash_init(&global_user_stats, system_charset_info, max_connections,
359271
=== modified file 'Percona-Server/sql/structs.h'
--- Percona-Server/sql/structs.h 2012-05-18 04:36:35 +0000
+++ Percona-Server/sql/structs.h 2013-10-14 13:46:40 +0000
@@ -275,30 +275,6 @@
275 ulonglong access_denied_errors,275 ulonglong access_denied_errors,
276 ulonglong empty_queries);276 ulonglong empty_queries);
277277
278/* Increment values of an instance of USER_STATS */
279extern void
280add_user_stats(USER_STATS *user_stats,
281 uint total_connections,
282 uint concurrent_connections,
283 time_t connected_time,
284 double busy_time,
285 double cpu_time,
286 ulonglong bytes_received,
287 ulonglong bytes_sent,
288 ulonglong binlog_bytes_written,
289 ha_rows rows_fetched,
290 ha_rows rows_updated,
291 ha_rows rows_read,
292 ulonglong select_commands,
293 ulonglong update_commands,
294 ulonglong other_commands,
295 ulonglong commit_trans,
296 ulonglong rollback_trans,
297 ulonglong denied_connections,
298 ulonglong lost_connections,
299 ulonglong access_denied_errors,
300 ulonglong empty_queries);
301
302typedef struct st_thread_stats {278typedef struct st_thread_stats {
303 my_thread_id id;279 my_thread_id id;
304 uint total_connections;280 uint total_connections;
@@ -351,30 +327,6 @@
351 ulonglong access_denied_errors,327 ulonglong access_denied_errors,
352 ulonglong empty_queries);328 ulonglong empty_queries);
353329
354/* Increment values of an instance of THREAD_STATS */
355extern void
356add_thread_stats(THREAD_STATS *thread_stats,
357 uint total_connections,
358 uint concurrent_connections,
359 time_t connected_time,
360 double busy_time,
361 double cpu_time,
362 ulonglong bytes_received,
363 ulonglong bytes_sent,
364 ulonglong binlog_bytes_written,
365 ha_rows rows_fetched,
366 ha_rows rows_updated,
367 ha_rows rows_read,
368 ulonglong select_commands,
369 ulonglong update_commands,
370 ulonglong other_commands,
371 ulonglong commit_trans,
372 ulonglong rollback_trans,
373 ulonglong denied_connections,
374 ulonglong lost_connections,
375 ulonglong access_denied_errors,
376 ulonglong empty_queries);
377
378typedef struct st_table_stats {330typedef struct st_table_stats {
379 char table[NAME_LEN * 2 + 2]; // [db] + '.' + [table] + '\0'331 char table[NAME_LEN * 2 + 2]; // [db] + '.' + [table] + '\0'
380 ulonglong rows_read, rows_changed;332 ulonglong rows_read, rows_changed;

Subscribers

People subscribed via source and target branches