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

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

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

Description of the change

Jenkns build seems to be removed already. New one started
http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/373/

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-25 13:13:06 +0000
+++ Percona-Server/sql/sql_connect.cc 2013-10-14 13:49:12 +0000
@@ -269,94 +269,6 @@
269 DBUG_VOID_RETURN;269 DBUG_VOID_RETURN;
270}270}
271271
272void add_user_stats(USER_STATS *user_stats,
273 uint total_connections,
274 uint concurrent_connections,
275 time_t connected_time,
276 double busy_time,
277 double cpu_time,
278 ulonglong bytes_received,
279 ulonglong bytes_sent,
280 ulonglong binlog_bytes_written,
281 ha_rows rows_fetched,
282 ha_rows rows_updated,
283 ha_rows rows_read,
284 ulonglong select_commands,
285 ulonglong update_commands,
286 ulonglong other_commands,
287 ulonglong commit_trans,
288 ulonglong rollback_trans,
289 ulonglong denied_connections,
290 ulonglong lost_connections,
291 ulonglong access_denied_errors,
292 ulonglong empty_queries)
293{
294 user_stats->total_connections+= total_connections;
295 user_stats->concurrent_connections+= concurrent_connections;
296 user_stats->connected_time+= connected_time;
297 user_stats->busy_time+= busy_time;
298 user_stats->cpu_time+= cpu_time;
299 user_stats->bytes_received+= bytes_received;
300 user_stats->bytes_sent+= bytes_sent;
301 user_stats->binlog_bytes_written+= binlog_bytes_written;
302 user_stats->rows_fetched+= rows_fetched;
303 user_stats->rows_updated+= rows_updated;
304 user_stats->rows_read+= rows_read;
305 user_stats->select_commands+= select_commands;
306 user_stats->update_commands+= update_commands;
307 user_stats->other_commands+= other_commands;
308 user_stats->commit_trans+= commit_trans;
309 user_stats->rollback_trans+= rollback_trans;
310 user_stats->denied_connections+= denied_connections;
311 user_stats->lost_connections+= lost_connections;
312 user_stats->access_denied_errors+= access_denied_errors;
313 user_stats->empty_queries+= empty_queries;
314}
315
316void add_thread_stats(THREAD_STATS *thread_stats,
317 uint total_connections,
318 uint concurrent_connections,
319 time_t connected_time,
320 double busy_time,
321 double cpu_time,
322 ulonglong bytes_received,
323 ulonglong bytes_sent,
324 ulonglong binlog_bytes_written,
325 ha_rows rows_fetched,
326 ha_rows rows_updated,
327 ha_rows rows_read,
328 ulonglong select_commands,
329 ulonglong update_commands,
330 ulonglong other_commands,
331 ulonglong commit_trans,
332 ulonglong rollback_trans,
333 ulonglong denied_connections,
334 ulonglong lost_connections,
335 ulonglong access_denied_errors,
336 ulonglong empty_queries)
337{
338 thread_stats->total_connections+= total_connections;
339 thread_stats->concurrent_connections+= concurrent_connections;
340 thread_stats->connected_time+= connected_time;
341 thread_stats->busy_time+= busy_time;
342 thread_stats->cpu_time+= cpu_time;
343 thread_stats->bytes_received+= bytes_received;
344 thread_stats->bytes_sent+= bytes_sent;
345 thread_stats->binlog_bytes_written+= binlog_bytes_written;
346 thread_stats->rows_fetched+= rows_fetched;
347 thread_stats->rows_updated+= rows_updated;
348 thread_stats->rows_read+= rows_read;
349 thread_stats->select_commands+= select_commands;
350 thread_stats->update_commands+= update_commands;
351 thread_stats->other_commands+= other_commands;
352 thread_stats->commit_trans+= commit_trans;
353 thread_stats->rollback_trans+= rollback_trans;
354 thread_stats->denied_connections+= denied_connections;
355 thread_stats->lost_connections+= lost_connections;
356 thread_stats->access_denied_errors+= access_denied_errors;
357 thread_stats->empty_queries+= empty_queries;
358}
359
360void init_global_user_stats(void)272void init_global_user_stats(void)
361{273{
362 if (my_hash_init(&global_user_stats, system_charset_info, max_connections,274 if (my_hash_init(&global_user_stats, system_charset_info, max_connections,
363275
=== modified file 'Percona-Server/sql/structs.h'
--- Percona-Server/sql/structs.h 2013-06-20 15:16:00 +0000
+++ Percona-Server/sql/structs.h 2013-10-14 13:49:12 +0000
@@ -298,30 +298,6 @@
298 ulonglong access_denied_errors,298 ulonglong access_denied_errors,
299 ulonglong empty_queries);299 ulonglong empty_queries);
300300
301/* Increment values of an instance of USER_STATS */
302extern void
303add_user_stats(USER_STATS *user_stats,
304 uint total_connections,
305 uint concurrent_connections,
306 time_t connected_time,
307 double busy_time,
308 double cpu_time,
309 ulonglong bytes_received,
310 ulonglong bytes_sent,
311 ulonglong binlog_bytes_written,
312 ha_rows rows_fetched,
313 ha_rows rows_updated,
314 ha_rows rows_read,
315 ulonglong select_commands,
316 ulonglong update_commands,
317 ulonglong other_commands,
318 ulonglong commit_trans,
319 ulonglong rollback_trans,
320 ulonglong denied_connections,
321 ulonglong lost_connections,
322 ulonglong access_denied_errors,
323 ulonglong empty_queries);
324
325typedef struct st_thread_stats {301typedef struct st_thread_stats {
326 my_thread_id id;302 my_thread_id id;
327 uint total_connections;303 uint total_connections;
@@ -374,30 +350,6 @@
374 ulonglong access_denied_errors,350 ulonglong access_denied_errors,
375 ulonglong empty_queries);351 ulonglong empty_queries);
376352
377/* Increment values of an instance of THREAD_STATS */
378extern void
379add_thread_stats(THREAD_STATS *thread_stats,
380 uint total_connections,
381 uint concurrent_connections,
382 time_t connected_time,
383 double busy_time,
384 double cpu_time,
385 ulonglong bytes_received,
386 ulonglong bytes_sent,
387 ulonglong binlog_bytes_written,
388 ha_rows rows_fetched,
389 ha_rows rows_updated,
390 ha_rows rows_read,
391 ulonglong select_commands,
392 ulonglong update_commands,
393 ulonglong other_commands,
394 ulonglong commit_trans,
395 ulonglong rollback_trans,
396 ulonglong denied_connections,
397 ulonglong lost_connections,
398 ulonglong access_denied_errors,
399 ulonglong empty_queries);
400
401typedef struct st_table_stats {353typedef struct st_table_stats {
402 char table[NAME_LEN * 2 + 2]; // [db] + '.' + [table] + '\0'354 char table[NAME_LEN * 2 + 2]; // [db] + '.' + [table] + '\0'
403 ulonglong rows_read, rows_changed;355 ulonglong rows_read, rows_changed;

Subscribers

People subscribed via source and target branches