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

Merge lp://staging/~laurynas-biveinis/percona-server/slow-log-fixes-5.1 into lp://staging/percona-server/5.1

  1. slow-log-fixes-5.1
  2. Merge into 5.1
Proposed by Laurynas Biveinis
Status: Merged
Approved by: Stewart Smith
Approved revision: no longer in the source branch.
Merged at revision: 529
Proposed branch: lp://staging/~laurynas-biveinis/percona-server/slow-log-fixes-5.1
Merge into: lp://staging/percona-server/5.1
Diff against target: 20056 lines (+9597/-9871)
52 files modified
Percona-Server/mysql-test/include/log_cleanup.inc (+1/-0)
Percona-Server/mysql-test/include/log_start.inc (+3/-8)
Percona-Server/mysql-test/include/log_stop.inc (+2/-2)
Percona-Server/mysql-test/include/percona_slow_extended_error_on_quit.inc (+0/-50)
Percona-Server/mysql-test/include/percona_slow_log_verbosity_grep.inc (+26/-0)
Percona-Server/mysql-test/r/percona_bug643149.result (+2/-2)
Percona-Server/mysql-test/r/percona_log_slow_admin_statements.result (+15/-6)
Percona-Server/mysql-test/r/percona_log_slow_filter.result (+0/-15)
Percona-Server/mysql-test/r/percona_log_slow_innodb.result (+42/-0)
Percona-Server/mysql-test/r/percona_log_slow_query_plan.result (+202/-0)
Percona-Server/mysql-test/r/percona_log_slow_query_plan_qc.result (+35/-0)
Percona-Server/mysql-test/r/percona_log_slow_slave_statements-innodb.result (+6/-1)
Percona-Server/mysql-test/r/percona_log_slow_slave_statements.result (+16/-36)
Percona-Server/mysql-test/r/percona_log_slow_sp_statements.result (+20/-19)
Percona-Server/mysql-test/r/percona_log_slow_timestamp_every.result (+13/-39)
Percona-Server/mysql-test/r/percona_log_slow_verbosity.result (+111/-16)
Percona-Server/mysql-test/r/percona_long_query_time.result (+2/-0)
Percona-Server/mysql-test/r/percona_mysqldumpslow.result (+8100/-9094)
Percona-Server/mysql-test/r/percona_slow_extended_error_on_quit.result (+20/-168)
Percona-Server/mysql-test/r/percona_slow_extended_log_error.result (+14/-0)
Percona-Server/mysql-test/r/percona_slow_query_log_microseconds_timestamp.result (+17/-17)
Percona-Server/mysql-test/r/percona_use_global_log_slow_control.result (+2/-0)
Percona-Server/mysql-test/r/percona_use_global_long_query_time.result (+2/-0)
Percona-Server/mysql-test/t/disabled.def (+1/-0)
Percona-Server/mysql-test/t/percona_log_slow_admin_statements.test (+41/-2)
Percona-Server/mysql-test/t/percona_log_slow_filter.test (+0/-26)
Percona-Server/mysql-test/t/percona_log_slow_innodb.test (+82/-0)
Percona-Server/mysql-test/t/percona_log_slow_query_plan.test (+302/-0)
Percona-Server/mysql-test/t/percona_log_slow_query_plan_qc.test (+71/-0)
Percona-Server/mysql-test/t/percona_log_slow_slave_statements-innodb-slave.opt (+0/-1)
Percona-Server/mysql-test/t/percona_log_slow_slave_statements-innodb.test (+16/-16)
Percona-Server/mysql-test/t/percona_log_slow_slave_statements-slave.opt (+0/-1)
Percona-Server/mysql-test/t/percona_log_slow_slave_statements.test (+50/-101)
Percona-Server/mysql-test/t/percona_log_slow_sp_statements.test (+34/-20)
Percona-Server/mysql-test/t/percona_log_slow_timestamp_every.test (+17/-29)
Percona-Server/mysql-test/t/percona_log_slow_verbosity.test (+75/-19)
Percona-Server/mysql-test/t/percona_long_query_time.test (+4/-0)
Percona-Server/mysql-test/t/percona_min_examined_row_limit.test (+1/-0)
Percona-Server/mysql-test/t/percona_mysqldumpslow.test (+59/-24)
Percona-Server/mysql-test/t/percona_slow_extended_error_on_quit.test (+58/-74)
Percona-Server/mysql-test/t/percona_slow_extended_log_error.test (+31/-0)
Percona-Server/mysql-test/t/percona_slow_query_log_microseconds_timestamp.test (+36/-24)
Percona-Server/mysql-test/t/percona_use_global_log_slow_control.test (+4/-1)
Percona-Server/mysql-test/t/percona_use_global_long_query_time.test (+5/-0)
Percona-Server/scripts/mysqldumpslow.sh (+3/-3)
Percona-Server/sql/event_scheduler.cc (+0/-1)
Percona-Server/sql/log.cc (+48/-22)
Percona-Server/sql/log_event.cc (+5/-9)
Percona-Server/sql/slave.cc (+1/-2)
Percona-Server/sql/sql_class.h (+0/-13)
Percona-Server/sql/sql_connect.cc (+0/-9)
Percona-Server/sql/sql_parse.cc (+2/-1)
To merge this branch: bzr merge lp://staging/~laurynas-biveinis/percona-server/slow-log-fixes-5.1
Reviewer Review Type Date Requested Status
Stewart Smith (community) Approve
Review via email: mp+144057@code.staging.launchpad.net

Description of the change

Multiple slow query log fixes and testsuite improvements. The MP corresponds to the 5.6 feature port in progress, that is, all these fixes have been backported from the 5.6 work.

The MP is big but should be relatively easy to review.

The updated testcases, notably percona_mysqldumpslow, still are unstable in Jenkins sometimes (but overall they fail much less now). I am putting this out anyway, and prefer to fix it as a follow-up.
Jenkins: http://jenkins.percona.com/job/percona-server-5.1-param/505/

To post a comment you must log in.
Revision history for this message
Stewart Smith (stewart) :
review: Approve
Revision history for this message
Stewart Smith (stewart) wrote :

When attempting to empty merge to 5.5:

http://jenkins.percona.com/view/Merge/job/merge-PS-5.1-merge-to-5.5/41/console

Text conflict in Percona-Server/mysql-test/r/percona_bug643149.result
Text conflict in Percona-Server/mysql-test/r/percona_log_slow_admin_statements.result
Text conflict in Percona-Server/mysql-test/r/percona_log_slow_query_plan.result
Text conflict in Percona-Server/mysql-test/r/percona_log_slow_query_plan_qc.result
Text conflict in Percona-Server/mysql-test/r/percona_log_slow_slave_statements.result
Text conflict in Percona-Server/mysql-test/r/percona_log_slow_sp_statements.result
Contents conflict in Percona-Server/mysql-test/r/percona_log_slow_timestamp_every.result
Text conflict in Percona-Server/mysql-test/r/percona_log_slow_verbosity.result
Contents conflict in Percona-Server/mysql-test/r/percona_mysqldumpslow.result
Text conflict in Percona-Server/mysql-test/r/percona_slow_extended_error_on_quit.result
Text conflict in Percona-Server/mysql-test/r/percona_slow_extended_log_error.result
Contents conflict in Percona-Server/mysql-test/r/percona_slow_query_log_microseconds_timestamp.result
Contents conflict in Percona-Server/mysql-test/r/percona_use_global_log_slow_control.result
Contents conflict in Percona-Server/mysql-test/r/percona_use_global_long_query_time.result
Text conflict in Percona-Server/mysql-test/t/disabled.def
Text conflict in Percona-Server/mysql-test/t/percona_log_slow_innodb.test
Text conflict in Percona-Server/mysql-test/t/percona_log_slow_query_plan.test
Text conflict in Percona-Server/mysql-test/t/percona_log_slow_query_plan_qc.test
Text conflict in Percona-Server/mysql-test/t/percona_log_slow_slave_statements-innodb.test
Text conflict in Percona-Server/mysql-test/t/percona_log_slow_slave_statements.test
Contents conflict in Percona-Server/mysql-test/t/percona_log_slow_timestamp_every.test
Text conflict in Percona-Server/mysql-test/t/percona_log_slow_verbosity.test
Contents conflict in Percona-Server/mysql-test/t/percona_mysqldumpslow.test
Text conflict in Percona-Server/mysql-test/t/percona_slow_extended_error_on_quit.test
Contents conflict in Percona-Server/mysql-test/t/percona_slow_query_log_microseconds_timestamp.test
Contents conflict in Percona-Server/mysql-test/t/percona_use_global_log_slow_control.test
Contents conflict in Percona-Server/mysql-test/t/percona_use_global_long_query_time.test
Text conflict in Percona-Server/scripts/mysqldumpslow.sh
Text conflict in Percona-Server/sql/event_scheduler.cc
Text conflict in Percona-Server/sql/log.cc
Text conflict in Percona-Server/sql/log_event.cc
Text conflict in Percona-Server/sql/sql_connect.cc
Text conflict in Percona-Server/sql/sql_parse.cc
33 conflicts encountered.
Build step 'Execute shell' marked build as failure
Finished: FAILURE

review: Needs Fixing
Revision history for this message
Stewart Smith (stewart) wrote :

Discussed on IRC with Laurynas, will by hand null merge to 5.5

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches