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

[Sergei Glushchenko]

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

[Alexey Kopytov (akopytov)]

review: Approve

=== 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 @@
   DBUG_VOID_RETURN;
 }
 
-void add_user_stats(USER_STATS *user_stats,
-                    uint total_connections,
-                    uint concurrent_connections,
-                    time_t connected_time,
-                    double busy_time,
-                    double cpu_time,
-                    ulonglong bytes_received,
-                    ulonglong bytes_sent,
-                    ulonglong binlog_bytes_written,
-                    ha_rows rows_fetched,
-                    ha_rows rows_updated,
-                    ha_rows rows_read,
-                    ulonglong select_commands,
-                    ulonglong update_commands,
-                    ulonglong other_commands,
-                    ulonglong commit_trans,
-                    ulonglong rollback_trans,
-                    ulonglong denied_connections,
-                    ulonglong lost_connections,
-                    ulonglong access_denied_errors,
-                    ulonglong empty_queries)
-{
-  user_stats->total_connections += total_connections;
-  user_stats->concurrent_connections += concurrent_connections;
-  user_stats->connected_time += connected_time;
-  user_stats->busy_time += busy_time;
-  user_stats->cpu_time += cpu_time;
-  user_stats->bytes_received += bytes_received;
-  user_stats->bytes_sent += bytes_sent;
-  user_stats->binlog_bytes_written += binlog_bytes_written;
-  user_stats->rows_fetched += rows_fetched;
-  user_stats->rows_updated += rows_updated;
-  user_stats->rows_read += rows_read;
-  user_stats->select_commands += select_commands;
-  user_stats->update_commands += update_commands;
-  user_stats->other_commands += other_commands;
-  user_stats->commit_trans += commit_trans;
-  user_stats->rollback_trans += rollback_trans;
-  user_stats->denied_connections += denied_connections;
-  user_stats->lost_connections += lost_connections;
-  user_stats->access_denied_errors += access_denied_errors;
-  user_stats->empty_queries += empty_queries;
-}
-
-void add_thread_stats(THREAD_STATS *thread_stats,
-                    uint total_connections,
-                    uint concurrent_connections,
-                    time_t connected_time,
-                    double busy_time,
-                    double cpu_time,
-                    ulonglong bytes_received,
-                    ulonglong bytes_sent,
-                    ulonglong binlog_bytes_written,
-                    ha_rows rows_fetched,
-                    ha_rows rows_updated,
-                    ha_rows rows_read,
-                    ulonglong select_commands,
-                    ulonglong update_commands,
-                    ulonglong other_commands,
-                    ulonglong commit_trans,
-                    ulonglong rollback_trans,
-                    ulonglong denied_connections,
-                    ulonglong lost_connections,
-                    ulonglong access_denied_errors,
-                    ulonglong empty_queries)
-{
-  thread_stats->total_connections += total_connections;
-  thread_stats->concurrent_connections += concurrent_connections;
-  thread_stats->connected_time += connected_time;
-  thread_stats->busy_time += busy_time;
-  thread_stats->cpu_time += cpu_time;
-  thread_stats->bytes_received += bytes_received;
-  thread_stats->bytes_sent += bytes_sent;
-  thread_stats->binlog_bytes_written += binlog_bytes_written;
-  thread_stats->rows_fetched += rows_fetched;
-  thread_stats->rows_updated += rows_updated;
-  thread_stats->rows_read += rows_read;
-  thread_stats->select_commands += select_commands;
-  thread_stats->update_commands += update_commands;
-  thread_stats->other_commands += other_commands;
-  thread_stats->commit_trans += commit_trans;
-  thread_stats->rollback_trans += rollback_trans;
-  thread_stats->denied_connections += denied_connections;
-  thread_stats->lost_connections += lost_connections;
-  thread_stats->access_denied_errors += access_denied_errors;
-  thread_stats->empty_queries += empty_queries;
-}
-
 void init_global_user_stats(void)
 {
   if (hash_init(&global_user_stats, system_charset_info, max_connections,

=== 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 @@
                 ulonglong access_denied_errors,
                 ulonglong empty_queries);
 
-/* Increment values of an instance of USER_STATS */
-extern void
-add_user_stats(USER_STATS *user_stats,
-               uint total_connections,
-               uint concurrent_connections,
-               time_t connected_time,
-               double busy_time,
-               double cpu_time,
-               ulonglong bytes_received,
-               ulonglong bytes_sent,
-               ulonglong binlog_bytes_written,
-               ha_rows rows_fetched,
-               ha_rows rows_updated,
-               ha_rows rows_read,
-               ulonglong select_commands,
-               ulonglong update_commands,
-               ulonglong other_commands,
-               ulonglong commit_trans,
-               ulonglong rollback_trans,
-               ulonglong denied_connections,
-               ulonglong lost_connections,
-               ulonglong access_denied_errors,
-               ulonglong empty_queries);
-
 typedef struct st_thread_stats {
   my_thread_id id;
   uint total_connections;
@@ -368,30 +344,6 @@
                 ulonglong access_denied_errors,
                 ulonglong empty_queries);
 
-/* Increment values of an instance of THREAD_STATS */
-extern void
-add_thread_stats(THREAD_STATS *thread_stats,
-               uint total_connections,
-               uint concurrent_connections,
-               time_t connected_time,
-               double busy_time,
-               double cpu_time,
-               ulonglong bytes_received,
-               ulonglong bytes_sent,
-               ulonglong binlog_bytes_written,
-               ha_rows rows_fetched,
-               ha_rows rows_updated,
-               ha_rows rows_read,
-               ulonglong select_commands,
-               ulonglong update_commands,
-               ulonglong other_commands,
-               ulonglong commit_trans,
-               ulonglong rollback_trans,
-               ulonglong denied_connections,
-               ulonglong lost_connections,
-               ulonglong access_denied_errors,
-               ulonglong empty_queries);
-
 typedef struct st_table_stats {
   char table[NAME_LEN * 2 + 2];  // [db] + '.' + [table] + '\0'
   ulonglong rows_read, rows_changed;