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

Merge lp:~tsarev/percona-server/5.5_slow_extended_tests_fixes into lp:percona-server/5.5

  1. 5.5_slow_extended_tests_fixes
  2. Merge into 5.5
Proposed by Oleg Tsarev
Status: Superseded
Proposed branch: lp:~tsarev/percona-server/5.5_slow_extended_tests_fixes
Merge into: lp:percona-server/5.5
Prerequisite: lp:~tsarev/percona-server/5.5_query_response_time_fix_bug_803867
Diff against target: 2208 lines (+972/-961)
52 files modified
mysql-test/log_connection_error.patch/percona_log_connection_error-master.opt (+1/-1)
mysql-test/log_connection_error.patch/percona_log_connection_error.result (+2/-1)
mysql-test/log_connection_error.patch/percona_log_connection_error.test (+6/-8)
mysql-test/slow_extended.patch/grep.inc (+0/-16)
mysql-test/slow_extended.patch/percona_bug643149.result (+0/-21)
mysql-test/slow_extended.patch/percona_bug643149.test (+0/-49)
mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter-master.opt (+0/-1)
mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter.result (+0/-25)
mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter.test (+0/-32)
mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl-master.opt (+0/-1)
mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl.result (+0/-3)
mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl.test (+0/-1)
mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl-master.opt (+0/-1)
mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl.result (+0/-9)
mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl.test (+0/-3)
mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-master.opt (+0/-1)
mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity.result (+0/-9)
mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity.test (+0/-12)
mysql-test/slow_extended.patch/percona_slow_extended-long_query_time-master.opt (+0/-1)
mysql-test/slow_extended.patch/percona_slow_extended-long_query_time.result (+0/-24)
mysql-test/slow_extended.patch/percona_slow_extended-long_query_time.test (+0/-23)
mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended-master.opt (+0/-1)
mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.result (+0/-13)
mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.test (+0/-23)
mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit-master.opt (+0/-1)
mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit.result (+0/-25)
mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit.test (+0/-32)
mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats-master.opt (+0/-1)
mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats-slave.opt (+0/-1)
mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.result (+0/-22)
mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.test (+0/-51)
mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time-master.opt (+0/-1)
mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time-slave.opt (+0/-1)
mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.result (+0/-89)
mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.test (+0/-107)
mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-master.opt (+0/-1)
mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-slave.opt (+0/-1)
mysql-test/slow_extended.patch/percona_slow_extended-slave_statements.result (+0/-94)
mysql-test/slow_extended.patch/percona_slow_extended-slave_statements.test (+0/-133)
mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl-master.opt (+0/-1)
mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.result (+0/-3)
mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.test (+0/-1)
mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_timestamp_always-cl-master.opt (+0/-1)
mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_timestamp_always-cl.result (+0/-3)
mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_timestamp_always-cl.test (+0/-1)
mysql-test/slow_extended.patch/percona_slow_extended-use_global_control-master.opt (+0/-1)
mysql-test/slow_extended.patch/percona_slow_extended-use_global_control.result (+0/-12)
mysql-test/slow_extended.patch/percona_slow_extended-use_global_control.test (+0/-12)
mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-master.opt (+0/-1)
mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time.result (+0/-46)
mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time.test (+0/-40)
slow_extended.patch (+963/-0)
To merge this branch: bzr merge lp:~tsarev/percona-server/5.5_slow_extended_tests_fixes
Reviewer Review Type Date Requested Status
Percona developers Pending
Review via email: mp+67822@code.launchpad.net

This proposal has been superseded by a proposal from 2011-07-13.

Commit message

1) Move all tests from mysql-test/slow_extended.patch to slow_extended.patch.
Now tests in "percona" suite
2) Rename all tests from percoa_slow_extended-X to X name
3) Extract start/stop/grep logic from tests to log_start/log_stop/log_grep includes
4) Remove tests mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time, because variable "use_global_long_query_time" was removed in 5.5 (and logic from this test) available in the slow_query_log_use_global_control.
5) Replace all SLEEP(X) by SET SESSION debug="+d,query_exec_time_X" or /* query_exec_time_X */
Also fixes bugs:
bug #794780 - "percona_slow_extended-microseconds_in_slow_extended sometimes fails"
bug #803071 - "add command-line variable setup test - log_slow_filter"
bug #803076 - "add command-line variable setup test - log_slow_slave_statements"
bug #803088 - "fix tests for log_slow_sp_statements:
bug #803093 - "add test for variable "log_slow_timestamp_every/slow_query_log_timestamp_always" (not command-line version)"
bug #803100 - "fix tests for use_global_log_slow_control/slow_query_log_use_global_control"
bug #803110 - "fix tests for slow_query_log_microseconds_timestamp/slow_query_log_timestamp_precision"
bug #803120 - "log_slow_verbosity ommited command-line tests in 5.5 "
bug #803137 - "rename percona_slow_extended-slave_innodb_stats.test to percona_slow_extended-log_slow_verbosity-innodb.test"
bug #760085 - "main.percona_slow_extended-slave_innodb_stats fails sporadically in 5.1.56 "
bug #803140 - "percona_slow_extended-min_examined_row_limit.test incorrect"

Description of the change

1) Move all tests from mysql-test/slow_extended.patch to slow_extended.patch.
Now tests in "percona" suite
2) Rename all tests from percoa_slow_extended-X to X name
3) Extract start/stop/grep logic from tests to log_start/log_stop/log_grep includes
4) Remove tests mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time, because variable "use_global_long_query_time" was removed in 5.5 (and logic from this test) available in the slow_query_log_use_global_control.
5) Replace all SLEEP(X) by SET SESSION debug="+d,query_exec_time_X" or /* query_exec_time_X */
Also fixes bugs:
bug #794780 - "percona_slow_extended-microseconds_in_slow_extended sometimes fails"
bug #803071 - "add command-line variable setup test - log_slow_filter"
bug #803076 - "add command-line variable setup test - log_slow_slave_statements"
bug #803088 - "fix tests for log_slow_sp_statements:
bug #803093 - "add test for variable "log_slow_timestamp_every/slow_query_log_timestamp_always" (not command-line version)"
bug #803100 - "fix tests for use_global_log_slow_control/slow_query_log_use_global_control"
bug #803110 - "fix tests for slow_query_log_microseconds_timestamp/slow_query_log_timestamp_precision"
bug #803120 - "log_slow_verbosity ommited command-line tests in 5.5 "
bug #803137 - "rename percona_slow_extended-slave_innodb_stats.test to percona_slow_extended-log_slow_verbosity-innodb.test"
bug #760085 - "main.percona_slow_extended-slave_innodb_stats fails sporadically in 5.1.56 "
bug #803140 - "percona_slow_extended-min_examined_row_limit.test incorrect"

To post a comment you must log in.
Revision history for this message
Oleg Tsarev (tsarev) wrote :

http://jenkins.percona.com/view/Percona%20Server%205.5/job/percona-server-5.5-param/40/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'mysql-test/log_connection_error.patch/percona_log_connection_error-master.opt'
--- mysql-test/log_connection_error.patch/percona_log_connection_error-master.opt 2010-12-09 18:30:58 +0000
+++ mysql-test/log_connection_error.patch/percona_log_connection_error-master.opt 2011-07-13 16:21:29 +0000
@@ -1,1 +1,1 @@
1--log-error1--log-error=$MYSQLTEST_VARDIR/percona.log_connection_error.err
22
=== modified file 'mysql-test/log_connection_error.patch/percona_log_connection_error.result'
--- mysql-test/log_connection_error.patch/percona_log_connection_error.result 2010-12-09 18:30:58 +0000
+++ mysql-test/log_connection_error.patch/percona_log_connection_error.result 2011-07-13 16:21:29 +0000
@@ -12,4 +12,5 @@
12ERROR HY000: Too many connections12ERROR HY000: Too many connections
13SET GLOBAL max_connections = @old_max_connections;13SET GLOBAL max_connections = @old_max_connections;
14SET GLOBAL log_warnings = @old_log_warnings;14SET GLOBAL log_warnings = @old_log_warnings;
15115[log_grep.inc] file: percona.log_connection_error.err pattern: Too many connections
16[log_grep.inc] lines: 1
1617
=== modified file 'mysql-test/log_connection_error.patch/percona_log_connection_error.test'
--- mysql-test/log_connection_error.patch/percona_log_connection_error.test 2011-04-09 15:41:52 +0000
+++ mysql-test/log_connection_error.patch/percona_log_connection_error.test 2011-07-13 16:21:29 +0000
@@ -38,17 +38,15 @@
38connection main;38connection main;
39SET GLOBAL max_connections = @old_max_connections;39SET GLOBAL max_connections = @old_max_connections;
40SET GLOBAL log_warnings = @old_log_warnings;40SET GLOBAL log_warnings = @old_log_warnings;
41let $log_error_= `SELECT @@GLOBAL.log_error`;41--let $log_error_=`SELECT @@GLOBAL.log_error`
42if(!`select LENGTH('$log_error_')`)42if(!`select LENGTH('$log_error_')`)
43{43{
44 # MySQL Server on windows is started with --console and thus44 # MySQL Server on windows is started with --console and thus
45 # does not know the location of its .err log, use default location45 # does not know the location of its .err log, use default location
46 let $log_error_ = $MYSQLTEST_VARDIR/log/mysqld.1.err;46 let $log_error_ = $MYSQLTEST_VARDIR/log/mysqld.1.err;
47}47}
48# Assign env variable LOG_ERROR48--let log_error=$log_error_
49let LOG_ERROR=$log_error_;49--let log_file=percona.log_connection_error.err
5050--let log_file_full_path=$log_error
51--let grep_file = $log_error51--let grep_pattern= Too many connections
52--let grep_pattern = Too many connections52--source suite/percona/include/log_grep.inc
53--source include/grep.inc
54exec $cmd;
5553
=== removed directory 'mysql-test/slow_extended.patch'
=== removed file 'mysql-test/slow_extended.patch/grep.inc'
--- mysql-test/slow_extended.patch/grep.inc 2011-01-16 14:55:00 +0000
+++ mysql-test/slow_extended.patch/grep.inc 1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
1perl;
2
3 $file = $ENV{'grep_file'};
4 $pattern = $ENV{'grep_pattern'};
5
6 open(FILE, "$file")
7 or die("Cannot open file $file: $!\n");
8
9 $lines = 0;
10 while(<FILE>) {
11 $lines++ if (/$pattern/);
12 }
13 print "$lines\n";
14
15 close(FILE);
16EOF
170
=== removed file 'mysql-test/slow_extended.patch/percona_bug643149.result'
--- mysql-test/slow_extended.patch/percona_bug643149.result 2011-06-05 04:47:53 +0000
+++ mysql-test/slow_extended.patch/percona_bug643149.result 1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
1SET @old_slow_query_log_file=@@global.slow_query_log_file;
2SET GLOBAL slow_query_log=on;
3SET LOCAL log_slow_verbosity='profiling';
4SET LOCAL long_query_time=0;
5SET GLOBAL slow_query_log_file='MYSQLTEST_VARDIR/percona_bug643149_slow.log';;
6SELECT 1;
71
81
9# User@Host: root[root] @ localhost []
10# Thread_id: X Schema: test Last_errno: X Killed: X
11# Query_time: X.X Lock_time: X.X Rows_sent: X Rows_examined: X Rows_affected: X Rows_read: X
12# Bytes_sent: X Tmp_tables: X Tmp_disk_tables: X Tmp_table_sizes: X
13# Profile_starting: X.X Profile_starting_cpu: X.X Profile_Opening_tables: X.X Profile_Opening_tables_cpu: X.X Profile_query_end: X.X Profile_query_end_cpu: X.X Profile_closing_tables: X.X Profile_closing_tables_cpu: X.X Profile_freeing_items: X.X Profile_freeing_items_cpu: X.X Profile_logging_slow_query: X.X Profile_logging_slow_query_cpu: X.X
14# Profile_total: X.X Profile_total_cpu: X.X
15# User@Host: root[root] @ localhost []
16# Thread_id: X Schema: test Last_errno: X Killed: X
17# Query_time: X.X Lock_time: X.X Rows_sent: X Rows_examined: X Rows_affected: X Rows_read: X
18# Bytes_sent: X Tmp_tables: X Tmp_disk_tables: X Tmp_table_sizes: X
19# Profile_starting: X.X Profile_starting_cpu: X.X Profile_checking_permissions: X.X Profile_checking_permissions_cpu: X.X Profile_Opening_tables: X.X Profile_Opening_tables_cpu: X.X Profile_init: X.X Profile_init_cpu: X.X Profile_optimizing: X.X Profile_optimizing_cpu: X.X Profile_executing: X.X Profile_executing_cpu: X.X Profile_end: X.X Profile_end_cpu: X.X Profile_query_end: X.X Profile_query_end_cpu: X.X Profile_closing_tables: X.X Profile_closing_tables_cpu: X.X Profile_freeing_items: X.X Profile_freeing_items_cpu: X.X Profile_logging_slow_query: X.X Profile_logging_slow_query_cpu: X.X
20# Profile_total: X.X Profile_total_cpu: X.X
21SET GLOBAL slow_query_log_file=@old_slow_query_log_file;
220
=== removed file 'mysql-test/slow_extended.patch/percona_bug643149.test'
--- mysql-test/slow_extended.patch/percona_bug643149.test 2011-06-05 04:47:53 +0000
+++ mysql-test/slow_extended.patch/percona_bug643149.test 1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
1#
2# This test suffers from server
3# Bug#38124 "general_log_file" variable silently unset when using expression
4# In short:
5# SET GLOBAL general_log_file = @<whatever>
6# SET GLOBAL slow_query_log = @<whatever>
7# cause that the value of these server system variables is set to default
8# instead of the assigned values. There comes no error message or warning.
9# If this bug is fixed please
10# 1. try this test with "let $fixed_bug38124 = 0;"
11# 2. remove all workarounds if 1. was successful.
12--source include/have_profiling.inc
13let $fixed_bug38124 = 0;
14
15SET @old_slow_query_log_file=@@global.slow_query_log_file;
16SET GLOBAL slow_query_log=on;
17SET LOCAL log_slow_verbosity='profiling';
18SET LOCAL long_query_time=0;
19
20let slogfile=$MYSQLTEST_VARDIR/percona_bug643149_slow.log;
21--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
22--eval SET GLOBAL slow_query_log_file='$slogfile';
23
24SELECT 1;
25
26perl;
27 $slogfile= $ENV{'slogfile'};
28
29 open(FILE, "$slogfile") or
30 die("Unable to read slow query log file $slogfile: $!\n");
31 while(<FILE>) {
32 next if (!/^#/);
33 next if (/^# Time:/);
34 s/[0-9]+/X/g;
35 print;
36 }
37
38 close(FILE);
39EOF
40
41SET GLOBAL slow_query_log_file=@old_slow_query_log_file;
42
43if(!$fixed_bug38124)
44{
45 --disable_query_log
46 let $my_var = `SELECT @old_slow_query_log_file`;
47 eval SET @@global.slow_query_log_file = '$my_var';
48 --enable_query_log
49}
500
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter-master.opt 2011-06-08 23:19:50 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter-master.opt 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1--slow-query-log-file=percona_slow_query_log-log_slow_filter.log --long-query-time=1 --slow_query_log=OFF
20
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter.result 2011-06-08 23:19:50 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter.result 1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
1drop table if exists t;
2# Create test table
3create table t(id INT PRIMARY KEY) engine=InnoDB;
4# Insert two rows to test table
5insert into t values(1);
6insert into t values(2);
7insert into t values(3);
8SET GLOBAL SLOW_QUERY_LOG=ON;
9SELECT sleep(2);
10sleep(2)
110
12set log_slow_filter=full_join;
13SELECT sleep(2) union select t2.id from t as t1,t as t2;
14sleep(2)
150
161
172
183
19SELECT sleep(2);
20sleep(2)
210
22SET GLOBAL SLOW_QUERY_LOG=OFF;
23drop table if exists t;
24FLUSH LOGS;
252
260
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter.test 2011-06-08 23:19:50 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter.test 1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
1source include/have_innodb.inc;
2
3--disable_warnings
4drop table if exists t;
5--enable_warnings
6
7--echo # Create test table
8create table t(id INT PRIMARY KEY) engine=InnoDB;
9--echo # Insert two rows to test table
10insert into t values(1);
11insert into t values(2);
12insert into t values(3);
13
14SET GLOBAL SLOW_QUERY_LOG=ON;
15
16SELECT sleep(2);
17
18set log_slow_filter=full_join;
19
20SELECT sleep(2) union select t2.id from t as t1,t as t2;
21SELECT sleep(2);
22
23SET GLOBAL SLOW_QUERY_LOG=OFF;
24
25--disable_warnings
26drop table if exists t;
27--enable_warnings
28
29FLUSH LOGS;
30--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-log_slow_filter.log
31--let grep_pattern = Query_time
32--source include/grep.inc
330
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl-master.opt 2010-12-17 21:49:42 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl-master.opt 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1--log_slow_sp_statements
20
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl.result 2010-12-17 21:49:42 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl.result 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
1show global variables like 'log_slow_sp_statements';
2Variable_name Value
3log_slow_sp_statements ON
40
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl.test 2010-12-17 21:49:42 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl.test 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1show global variables like 'log_slow_sp_statements';
20
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl-master.opt 2010-12-17 21:49:42 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl-master.opt 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1--log_slow_verbosity="full"
20
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl.result 2010-12-17 21:49:42 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl.result 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
1show global variables like 'log_slow_verbosity';
2Variable_name Value
3log_slow_verbosity microtime,query_plan,innodb
4show variables like 'log_slow_verbosity';
5Variable_name Value
6log_slow_verbosity microtime,query_plan,innodb
7select @@log_slow_verbosity;
8@@log_slow_verbosity
9microtime,query_plan,innodb
100
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl.test 2010-12-17 21:49:42 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl.test 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
1show global variables like 'log_slow_verbosity';
2show variables like 'log_slow_verbosity';
3select @@log_slow_verbosity;
40
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-master.opt 2011-01-16 14:55:00 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity-master.opt 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1--slow-query-log-file=percona_slow_query_log-log_slow_verbosity.log --long-query-time=1
20
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity.result 2011-01-16 14:55:00 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity.result 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
1SELECT sleep(2);
2sleep(2)
30
4set log_slow_verbosity=innodb;
5SELECT sleep(2);
6sleep(2)
70
8FLUSH LOGS;
91
100
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity.test 2011-01-16 14:55:00 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity.test 1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
1source include/have_innodb.inc;
2
3SELECT sleep(2);
4
5set log_slow_verbosity=innodb;
6
7SELECT sleep(2);
8
9FLUSH LOGS;
10--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-log_slow_verbosity.log
11--let grep_pattern = No InnoDB statistics available for this query
12--source include/grep.inc
130
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-long_query_time-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-long_query_time-master.opt 2011-06-08 23:19:50 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-long_query_time-master.opt 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1--slow-query-log-file=percona_slow_query_log-long_query_time.log --long-query-time=2 --slow-query-log=OFF
20
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-long_query_time.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-long_query_time.result 2011-06-08 23:19:50 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-long_query_time.result 1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
1SET GLOBAL SLOW_QUERY_LOG=ON;
2SELECT sleep(1);
3sleep(1)
40
5SELECT sleep(3);
6sleep(3)
70
8SELECT sleep(5);
9sleep(5)
100
11set long_query_time=4;
12SELECT sleep(1);
13sleep(1)
140
15SELECT sleep(3);
16sleep(3)
170
18SELECT sleep(5);
19sleep(5)
200
21set long_query_time=2;
22SET GLOBAL SLOW_QUERY_LOG=OFF;
23FLUSH LOGS;
243
250
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-long_query_time.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-long_query_time.test 2011-06-08 23:19:50 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-long_query_time.test 1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
1source include/have_innodb.inc;
2
3SET GLOBAL SLOW_QUERY_LOG=ON;
4
5SELECT sleep(1);
6SELECT sleep(3);
7SELECT sleep(5);
8
9set long_query_time=4;
10
11SELECT sleep(1);
12SELECT sleep(3);
13SELECT sleep(5);
14
15set long_query_time=2;
16
17SET GLOBAL SLOW_QUERY_LOG=OFF;
18
19FLUSH LOGS;
20--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-long_query_time.log
21--let grep_pattern = Query_time
22--source include/grep.inc
23
240
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended-master.opt 2011-06-08 23:19:50 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended-master.opt 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1--slow-query-log-file=percona_slow_query_log-microseconds_in_slow_query_log.log --long-query-time=1 --slow_query_log=OFF
20
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.result 2011-06-08 23:19:50 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.result 1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
1SET GLOBAL SLOW_QUERY_LOG=ON;
2SELECT sleep(2);
3sleep(2)
40
5set global slow_query_log_timestamp_precision='microsecond';
6SELECT sleep(2);
7sleep(2)
80
9set global slow_query_log_timestamp_precision='second';
10SET GLOBAL SLOW_QUERY_LOG=OFF;
11FLUSH LOGS;
121
132
140
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.test 2011-06-08 23:19:50 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.test 1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
1source include/have_innodb.inc;
2
3SET GLOBAL SLOW_QUERY_LOG=ON;
4
5SELECT sleep(2);
6
7set global slow_query_log_timestamp_precision='microsecond';
8
9SELECT sleep(2);
10
11set global slow_query_log_timestamp_precision='second';
12
13SET GLOBAL SLOW_QUERY_LOG=OFF;
14
15FLUSH LOGS;
16--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-microseconds_in_slow_query_log.log
17--let grep_pattern = # Time: [0-9]+[ ]+[0-9]+:[0-9]+:[0-9]+.[0-9]+
18--source include/grep.inc
19
20--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-microseconds_in_slow_query_log.log
21--let grep_pattern = # Time: [0-9]+[ ]+[0-9]+:[0-9]+:[0-9]+
22--source include/grep.inc
23
240
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit-master.opt 2011-06-08 23:19:50 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit-master.opt 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1--slow-query-log-file=percona_slow_query_log-min_examined_row_limit.log --long-query-time=1 --slow-query-log=OFF
20
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit.result 2011-06-08 23:19:50 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit.result 1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
1drop table if exists t;
2# Create test table
3create table t(id INT PRIMARY KEY) engine=InnoDB;
4# Insert two rows to test table
5insert into t values(1);
6insert into t values(2);
7insert into t values(3);
8SET GLOBAL SLOW_QUERY_LOG=ON;
9SELECT sleep(2);
10sleep(2)
110
12set min_examined_row_limit=5;
13SELECT sleep(2) union select t2.id from t as t1,t as t2;
14sleep(2)
150
161
172
183
19SELECT sleep(2);
20sleep(2)
210
22SET GLOBAL SLOW_QUERY_LOG=OFF;
23drop table if exists t;
24FLUSH LOGS;
252
260
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit.test 2011-06-08 23:19:50 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit.test 1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
1source include/have_innodb.inc;
2
3--disable_warnings
4drop table if exists t;
5--enable_warnings
6
7--echo # Create test table
8create table t(id INT PRIMARY KEY) engine=InnoDB;
9--echo # Insert two rows to test table
10insert into t values(1);
11insert into t values(2);
12insert into t values(3);
13
14SET GLOBAL SLOW_QUERY_LOG=ON;
15
16SELECT sleep(2);
17
18set min_examined_row_limit=5;
19
20SELECT sleep(2) union select t2.id from t as t1,t as t2;
21SELECT sleep(2);
22
23SET GLOBAL SLOW_QUERY_LOG=OFF;
24
25--disable_warnings
26drop table if exists t;
27--enable_warnings
28
29FLUSH LOGS;
30--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-min_examined_row_limit.log
31--let grep_pattern = Query_time
32--source include/grep.inc
330
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats-master.opt 2010-12-09 18:30:58 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats-master.opt 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1--long_query_time=0 --log_slow_verbosity=innodb --log_slow_slave_statements
20
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats-slave.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats-slave.opt 2010-12-09 18:30:58 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats-slave.opt 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1--long_query_time=0 --log_slow_verbosity=innodb --log_slow_slave_statements
20
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.result 2011-02-22 00:56:16 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.result 1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
1include/master-slave.inc
2[connection master]
3DROP TABLE IF EXISTS t;
4CREATE TABLE t(id INT,data CHAR(30)) ENGINE=InnoDB;
5INSERT INTO t VALUES
6(1,"aaaaabbbbbcccccdddddeeeeefffff"),
7(2,"aaaaabbbbbcccccdddddeeeeefffff"),
8(3,"aaaaabbbbbcccccdddddeeeeefffff"),
9(4,"aaaaabbbbbcccccdddddeeeeefffff"),
10(5,"aaaaabbbbbcccccdddddeeeeefffff");
11INSERT INTO t SELECT t2.id,t2.data from t as t1, t as t2;
12INSERT INTO t SELECT t2.id,t2.data from t as t1, t as t2;
13STOP SLAVE;
14include/wait_for_slave_to_stop.inc
15START SLAVE;
16include/wait_for_slave_to_start.inc
17INSERT INTO t SELECT t.id,t.data from t;
18DROP TABLE IF EXISTS t;
19FLUSH LOGS;
204
21STOP SLAVE;
22include/wait_for_slave_to_stop.inc
230
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.test 2011-02-22 00:56:16 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.test 1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
1-- source include/have_binlog_format_mixed_or_statement.inc
2-- source include/have_innodb.inc
3-- source include/master-slave.inc
4
5connection master;
6-- disable_warnings
7DROP TABLE IF EXISTS t;
8-- enable_warnings
9CREATE TABLE t(id INT,data CHAR(30)) ENGINE=InnoDB;
10INSERT INTO t VALUES
11(1,"aaaaabbbbbcccccdddddeeeeefffff"),
12(2,"aaaaabbbbbcccccdddddeeeeefffff"),
13(3,"aaaaabbbbbcccccdddddeeeeefffff"),
14(4,"aaaaabbbbbcccccdddddeeeeefffff"),
15(5,"aaaaabbbbbcccccdddddeeeeefffff");
16INSERT INTO t SELECT t2.id,t2.data from t as t1, t as t2;
17INSERT INTO t SELECT t2.id,t2.data from t as t1, t as t2;
18sync_slave_with_master;
19
20connection slave;
21STOP SLAVE;
22-- source include/wait_for_slave_to_stop.inc
23--write_file $MYSQLTEST_VARDIR/tmp/mysqld.2.expect
24wait
25EOF
26--shutdown_server 10
27--source include/wait_until_disconnected.inc
28--append_file $MYSQLTEST_VARDIR/tmp/mysqld.2.expect
29restart
30EOF
31--enable_reconnect
32--source include/wait_until_connected_again.inc
33START SLAVE;
34-- source include/wait_for_slave_to_start.inc
35
36connection master;
37INSERT INTO t SELECT t.id,t.data from t;
38sync_slave_with_master;
39
40connection master;
41DROP TABLE IF EXISTS t;
42sync_slave_with_master;
43
44connection slave;
45FLUSH LOGS;
46--let grep_file = $MYSQLTEST_VARDIR/mysqld.2/mysqld-slow.log
47--let grep_pattern = InnoDB_IO_r_ops
48--source include/grep.inc
49
50STOP SLAVE;
51-- source include/wait_for_slave_to_stop.inc
520
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time-master.opt 2011-01-16 14:55:00 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time-master.opt 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1--slow-query-log-file=percona_log_slow_slave_statements-master.log --long-query-time=1
20
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time-slave.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time-slave.opt 2011-01-16 14:55:00 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time-slave.opt 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1--slow-query-log-file=percona_log_slow_slave_statements-slave.log --long-query-time=1
20
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.result 2011-02-22 00:56:16 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.result 1970-01-01 00:00:00 +0000
@@ -1,89 +0,0 @@
1include/master-slave.inc
2[connection master]
3DROP TABLE IF EXISTS t;
4CREATE TABLE t(id INT);
5START SLAVE;
6include/wait_for_slave_to_start.inc
7INSERT INTO t VALUES (1);
8show variables like 'log_slow_slave_statements';
9Variable_name Value
10log_slow_slave_statements OFF
11set global log_slow_slave_statements=ON;
12show variables like 'log_slow_slave_statements';
13Variable_name Value
14log_slow_slave_statements ON
15INSERT INTO t VALUES (2);
16STOP SLAVE;
17include/wait_for_slave_to_stop.inc
18START SLAVE;
19include/wait_for_slave_to_start.inc
20INSERT INTO t VALUES (3);
21show variables like 'long_query_time';
22Variable_name Value
23long_query_time 1.000000
24show global variables like 'long_query_time';
25Variable_name Value
26long_query_time 1.000000
27show global variables like 'slow_query_log_use_global_control';
28Variable_name Value
29slow_query_log_use_global_control
30set global long_query_time=0;
31show variables like 'long_query_time';
32Variable_name Value
33long_query_time 1.000000
34show global variables like 'long_query_time';
35Variable_name Value
36long_query_time 0.000000
37show global variables like 'slow_query_log_use_global_control';
38Variable_name Value
39slow_query_log_use_global_control
40INSERT INTO t VALUES (4);
41show variables like 'long_query_time';
42Variable_name Value
43long_query_time 1.000000
44show global variables like 'long_query_time';
45Variable_name Value
46long_query_time 0.000000
47show global variables like 'slow_query_log_use_global_control';
48Variable_name Value
49slow_query_log_use_global_control
50set global slow_query_log_use_global_control='long_query_time';
51show variables like 'long_query_time';
52Variable_name Value
53long_query_time 0.000000
54show global variables like 'long_query_time';
55Variable_name Value
56long_query_time 0.000000
57show global variables like 'slow_query_log_use_global_control';
58Variable_name Value
59slow_query_log_use_global_control long_query_time
60INSERT INTO t VALUES (5);
61show variables like 'long_query_time';
62Variable_name Value
63long_query_time 0.000000
64show global variables like 'long_query_time';
65Variable_name Value
66long_query_time 0.000000
67show global variables like 'slow_query_log_use_global_control';
68Variable_name Value
69slow_query_log_use_global_control long_query_time
70set global long_query_time=1;
71set global slow_query_log_use_global_control='';
72FLUSH LOGS;
73# Analyse master slow_query_log
740
750
760
770
780
79FLUSH LOGS;
80# Analyse slave slow_query_log
810
820
830
840
851
86set global log_slow_slave_statements=OFF;
87DROP TABLE t;
88STOP SLAVE;
89include/wait_for_slave_to_stop.inc
900
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.test 2011-02-22 00:56:16 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.test 1970-01-01 00:00:00 +0000
@@ -1,107 +0,0 @@
1-- source include/have_binlog_format_mixed_or_statement.inc
2-- source include/master-slave.inc
3
4connection master;
5-- disable_warnings
6DROP TABLE IF EXISTS t;
7-- enable_warnings
8CREATE TABLE t(id INT);
9
10-- disable_warnings
11connection slave;
12START SLAVE;
13-- source include/wait_for_slave_to_start.inc
14-- enable_warnings
15
16connection master;
17INSERT INTO t VALUES (1);
18sync_slave_with_master;
19
20connection slave;
21show variables like 'log_slow_slave_statements';
22set global log_slow_slave_statements=ON;
23show variables like 'log_slow_slave_statements';
24
25connection master;
26INSERT INTO t VALUES (2);
27sync_slave_with_master;
28connection slave;
29
30STOP SLAVE;
31-- source include/wait_for_slave_to_stop.inc
32START SLAVE;
33-- source include/wait_for_slave_to_start.inc
34
35connection master;
36INSERT INTO t VALUES (3);
37sync_slave_with_master;
38
39connection slave;
40show variables like 'long_query_time';
41show global variables like 'long_query_time';
42show global variables like 'slow_query_log_use_global_control';
43set global long_query_time=0;
44show variables like 'long_query_time';
45show global variables like 'long_query_time';
46show global variables like 'slow_query_log_use_global_control';
47
48connection master;
49INSERT INTO t VALUES (4);
50sync_slave_with_master;
51
52connection slave;
53show variables like 'long_query_time';
54show global variables like 'long_query_time';
55show global variables like 'slow_query_log_use_global_control';
56set global slow_query_log_use_global_control='long_query_time';
57show variables like 'long_query_time';
58show global variables like 'long_query_time';
59show global variables like 'slow_query_log_use_global_control';
60
61#-- echo # Make insert(5) on master
62connection master;
63INSERT INTO t VALUES (5);
64sync_slave_with_master;
65connection slave;
66show variables like 'long_query_time';
67show global variables like 'long_query_time';
68show global variables like 'slow_query_log_use_global_control';
69set global long_query_time=1;
70set global slow_query_log_use_global_control='';
71
72connection master;
73FLUSH LOGS;
74
75-- echo # Analyse master slow_query_log
76let $i=5;
77let $k=1;
78while($i)
79{
80 --let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_log_slow_slave_statements-master.log
81 --let grep_pattern = INSERT INTO t VALUES \($k\)
82 --source include/grep.inc
83 dec $i;
84 inc $k;
85}
86
87connection slave;
88FLUSH LOGS;
89
90-- echo # Analyse slave slow_query_log
91let $i=5;
92let $k=1;
93while($i)
94{
95 --let grep_file = $MYSQLTEST_VARDIR/mysqld.2/data/percona_log_slow_slave_statements-slave.log
96 --let grep_pattern = INSERT INTO t VALUES \($k\)
97 --source include/grep.inc
98 dec $i;
99 inc $k;
100}
101set global log_slow_slave_statements=OFF;
102
103connection master;
104DROP TABLE t;
105sync_slave_with_master;
106STOP SLAVE;
107-- source include/wait_for_slave_to_stop.inc
1080
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-master.opt 2011-01-16 14:55:00 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-master.opt 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1--slow-query-log-file=percona_log_slow_slave_statements-master.log --long-query-time=0
20
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-slave.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-slave.opt 2011-01-16 14:55:00 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-slave.opt 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1--slow-query-log-file=percona_log_slow_slave_statements-slave.log --long-query-time=0
20
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_statements.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_statements.result 2011-02-22 00:56:16 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_statements.result 1970-01-01 00:00:00 +0000
@@ -1,94 +0,0 @@
1include/master-slave.inc
2[connection master]
3DROP TABLE IF EXISTS t;
4CREATE TABLE t(id INT);
5START SLAVE;
6include/wait_for_slave_to_start.inc
7INSERT INTO t VALUES (1);
8show variables like 'log_slow_slave_statements';
9Variable_name Value
10log_slow_slave_statements OFF
11set global log_slow_slave_statements=ON;
12show variables like 'log_slow_slave_statements';
13Variable_name Value
14log_slow_slave_statements ON
15INSERT INTO t VALUES (2);
16show variables like 'log_slow_slave_statements';
17Variable_name Value
18log_slow_slave_statements ON
19set global log_slow_slave_statements=ON;
20show variables like 'log_slow_slave_statements';
21Variable_name Value
22log_slow_slave_statements ON
23STOP SLAVE;
24include/wait_for_slave_to_stop.inc
25START SLAVE;
26include/wait_for_slave_to_start.inc
27show variables like 'log_slow_slave_statements';
28Variable_name Value
29log_slow_slave_statements ON
30set global log_slow_slave_statements=ON;
31show variables like 'log_slow_slave_statements';
32Variable_name Value
33log_slow_slave_statements ON
34INSERT INTO t VALUES (3);
35show variables like 'log_slow_slave_statements';
36Variable_name Value
37log_slow_slave_statements ON
38set global log_slow_slave_statements=OFF;
39show variables like 'log_slow_slave_statements';
40Variable_name Value
41log_slow_slave_statements OFF
42INSERT INTO t VALUES (4);
43show variables like 'log_slow_slave_statements';
44Variable_name Value
45log_slow_slave_statements OFF
46STOP SLAVE;
47include/wait_for_slave_to_stop.inc
48START SLAVE;
49include/wait_for_slave_to_start.inc
50show variables like 'log_slow_slave_statements';
51Variable_name Value
52log_slow_slave_statements OFF
53INSERT INTO t VALUES (5);
54show variables like 'log_slow_slave_statements';
55Variable_name Value
56log_slow_slave_statements OFF
57set global log_slow_slave_statements=ON;
58show variables like 'log_slow_slave_statements';
59Variable_name Value
60log_slow_slave_statements ON
61INSERT INTO t VALUES (6);
62show variables like 'log_slow_slave_statements';
63Variable_name Value
64log_slow_slave_statements ON
65STOP SLAVE;
66include/wait_for_slave_to_stop.inc
67START SLAVE;
68include/wait_for_slave_to_start.inc
69show variables like 'log_slow_slave_statements';
70Variable_name Value
71log_slow_slave_statements ON
72INSERT INTO t VALUES (7);
73FLUSH LOGS;
74# Analyse master slow_query_log
751
761
771
781
791
801
811
82FLUSH LOGS;
83# Analyse slave slow_query_log
840
850
861
870
880
890
901
91set global log_slow_slave_statements=OFF;
92DROP TABLE t;
93STOP SLAVE;
94include/wait_for_slave_to_stop.inc
950
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_statements.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_statements.test 2011-02-22 00:56:16 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_statements.test 1970-01-01 00:00:00 +0000
@@ -1,133 +0,0 @@
1-- source include/have_binlog_format_statement.inc
2-- source include/master-slave.inc
3
4connection master;
5-- disable_warnings
6DROP TABLE IF EXISTS t;
7-- enable_warnings
8
9CREATE TABLE t(id INT);
10
11-- disable_warnings
12connection slave;
13START SLAVE;
14-- source include/wait_for_slave_to_start.inc
15-- enable_warnings
16
17connection master;
18INSERT INTO t VALUES (1);
19sync_slave_with_master;
20
21connection slave;
22show variables like 'log_slow_slave_statements';
23set global log_slow_slave_statements=ON;
24show variables like 'log_slow_slave_statements';
25
26connection master;
27INSERT INTO t VALUES (2);
28sync_slave_with_master;
29
30connection slave;
31show variables like 'log_slow_slave_statements';
32set global log_slow_slave_statements=ON;
33show variables like 'log_slow_slave_statements';
34
35STOP SLAVE;
36-- source include/wait_for_slave_to_stop.inc
37START SLAVE;
38-- source include/wait_for_slave_to_start.inc
39
40connection slave;
41show variables like 'log_slow_slave_statements';
42set global log_slow_slave_statements=ON;
43show variables like 'log_slow_slave_statements';
44
45connection master;
46INSERT INTO t VALUES (3);
47sync_slave_with_master;
48
49connection slave;
50show variables like 'log_slow_slave_statements';
51set global log_slow_slave_statements=OFF;
52show variables like 'log_slow_slave_statements';
53
54connection master;
55INSERT INTO t VALUES (4);
56sync_slave_with_master;
57
58connection slave;
59show variables like 'log_slow_slave_statements';
60
61STOP SLAVE;
62-- source include/wait_for_slave_to_stop.inc
63START SLAVE;
64-- source include/wait_for_slave_to_start.inc
65
66connection slave;
67show variables like 'log_slow_slave_statements';
68
69connection master;
70INSERT INTO t VALUES (5);
71sync_slave_with_master;
72
73connection slave;
74show variables like 'log_slow_slave_statements';
75set global log_slow_slave_statements=ON;
76show variables like 'log_slow_slave_statements';
77
78connection master;
79INSERT INTO t VALUES (6);
80sync_slave_with_master;
81
82connection slave;
83show variables like 'log_slow_slave_statements';
84
85STOP SLAVE;
86-- source include/wait_for_slave_to_stop.inc
87START SLAVE;
88-- source include/wait_for_slave_to_start.inc
89
90connection slave;
91show variables like 'log_slow_slave_statements';
92
93connection master;
94INSERT INTO t VALUES (7);
95sync_slave_with_master;
96
97connection master;
98FLUSH LOGS;
99
100-- echo # Analyse master slow_query_log
101let $i=7;
102let $k=1;
103while($i)
104{
105 --let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_log_slow_slave_statements-master.log
106 --let grep_pattern = INSERT INTO t VALUES \($k\)
107 --source include/grep.inc
108 dec $i;
109 inc $k;
110}
111
112connection slave;
113FLUSH LOGS;
114
115-- echo # Analyse slave slow_query_log
116let $i=7;
117let $k=1;
118while($i)
119{
120 --let grep_file = $MYSQLTEST_VARDIR/mysqld.2/data/percona_log_slow_slave_statements-slave.log
121 --let grep_pattern = INSERT INTO t VALUES \($k\)
122 --source include/grep.inc
123 dec $i;
124 inc $k;
125}
126set global log_slow_slave_statements=OFF;
127
128connection master;
129DROP TABLE t;
130sync_slave_with_master;
131
132STOP SLAVE;
133-- source include/wait_for_slave_to_stop.inc
1340
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl-master.opt 2011-02-22 00:56:16 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl-master.opt 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1--slow_query_log_timestamp_precision='microsecond'
20
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.result 2011-02-22 00:56:16 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.result 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
1show global variables like 'slow_query_log_timestamp_precision';
2Variable_name Value
3slow_query_log_timestamp_precision microsecond
40
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.test 2011-02-22 00:56:16 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.test 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1show global variables like 'slow_query_log_timestamp_precision';
20
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_timestamp_always-cl-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_timestamp_always-cl-master.opt 2011-02-22 00:56:16 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_timestamp_always-cl-master.opt 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1--slow_query_log_timestamp_always
20
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_timestamp_always-cl.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_timestamp_always-cl.result 2011-02-22 00:56:16 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_timestamp_always-cl.result 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
1show global variables like 'slow_query_log_timestamp_always';
2Variable_name Value
3slow_query_log_timestamp_always ON
40
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_timestamp_always-cl.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_timestamp_always-cl.test 2011-02-22 00:56:16 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_timestamp_always-cl.test 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1show global variables like 'slow_query_log_timestamp_always';
20
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-use_global_control-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-use_global_control-master.opt 2011-02-22 00:56:16 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-use_global_control-master.opt 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1--slow-query-log-file=percona_slow_query_log-control_global_slow.log --long-query-time=1
20
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-use_global_control.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-use_global_control.result 2011-02-22 00:56:16 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-use_global_control.result 1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
1SELECT sleep(2);
2sleep(2)
30
4set global log_slow_verbosity=innodb;
5set global slow_query_log_use_global_control="log_slow_verbosity,long_query_time";
6SELECT sleep(2);
7sleep(2)
80
9set global slow_query_log_use_global_control='';
10set global log_slow_verbosity='';
11FLUSH LOGS;
121
130
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-use_global_control.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-use_global_control.test 2011-02-22 00:56:16 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-use_global_control.test 1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
1source include/have_innodb.inc;
2SELECT sleep(2);
3set global log_slow_verbosity=innodb;
4set global slow_query_log_use_global_control="log_slow_verbosity,long_query_time";
5SELECT sleep(2);
6set global slow_query_log_use_global_control='';
7set global log_slow_verbosity='';
8
9FLUSH LOGS;
10--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-control_global_slow.log
11--let grep_pattern = No InnoDB statistics available for this query
12--source include/grep.inc
130
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-master.opt'
--- mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-master.opt 2011-06-08 23:19:50 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-master.opt 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1--slow-query-log-file=percona_slow_query_log-use_global_long_query_time.log --long-query-time=2 --slow_query_log_use_global_control=long_query_time --slow-query-log=OFF
20
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time.result'
--- mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time.result 2011-06-08 23:19:50 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time.result 1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
1SET GLOBAL SLOW_QUERY_LOG=ON;
2SELECT sleep(1);
3sleep(1)
40
5SELECT sleep(3);
6sleep(3)
70
8SELECT sleep(5);
9sleep(5)
100
11set global long_query_time=4;
12set global slow_query_log_use_global_control='long_query_time';
13SELECT sleep(1);
14sleep(1)
150
16SELECT sleep(3);
17sleep(3)
180
19SELECT sleep(5);
20sleep(5)
210
22set global long_query_time=2;
23set global slow_query_log_use_global_control='';
24SET GLOBAL SLOW_QUERY_LOG=OFF;
25FLUSH LOGS;
263
27show global variables like 'slow_query_log_use_global_control';
28Variable_name Value
29slow_query_log_use_global_control
30set global slow_query_log_use_global_control='long_query_time';
31show global variables like 'slow_query_log_use_global_control';
32Variable_name Value
33slow_query_log_use_global_control long_query_time
34set global slow_query_log_use_global_control='log_slow_filter,long_query_time';
35show global variables like 'slow_query_log_use_global_control';
36Variable_name Value
37slow_query_log_use_global_control log_slow_filter,long_query_time
38set global slow_query_log_use_global_control='log_slow_filter';
39show global variables like 'slow_query_log_use_global_control';
40Variable_name Value
41slow_query_log_use_global_control log_slow_filter
42set global slow_query_log_use_global_control='';
43show global variables like 'slow_query_log_use_global_control';
44Variable_name Value
45slow_query_log_use_global_control
46set global slow_query_log_use_global_control='long_query_time';
470
=== removed file 'mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time.test 2011-06-08 23:19:50 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time.test 1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
1source include/have_innodb.inc;
2
3SET GLOBAL SLOW_QUERY_LOG=ON;
4
5SELECT sleep(1);
6SELECT sleep(3);
7SELECT sleep(5);
8
9set global long_query_time=4;
10set global slow_query_log_use_global_control='long_query_time';
11
12SELECT sleep(1);
13SELECT sleep(3);
14SELECT sleep(5);
15
16set global long_query_time=2;
17set global slow_query_log_use_global_control='';
18
19SET GLOBAL SLOW_QUERY_LOG=OFF;
20
21FLUSH LOGS;
22--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-use_global_long_query_time.log
23--let grep_pattern = Query_time
24--source include/grep.inc
25
26show global variables like 'slow_query_log_use_global_control';
27
28set global slow_query_log_use_global_control='long_query_time';
29show global variables like 'slow_query_log_use_global_control';
30
31set global slow_query_log_use_global_control='log_slow_filter,long_query_time';
32show global variables like 'slow_query_log_use_global_control';
33
34set global slow_query_log_use_global_control='log_slow_filter';
35show global variables like 'slow_query_log_use_global_control';
36
37set global slow_query_log_use_global_control='';
38show global variables like 'slow_query_log_use_global_control';
39
40set global slow_query_log_use_global_control='long_query_time';
410
=== modified file 'slow_extended.patch'
--- slow_extended.patch 2011-07-13 16:21:28 +0000
+++ slow_extended.patch 2011-07-13 16:21:29 +0000
@@ -1350,3 +1350,966 @@
1350 };1350 };
1351 1351
1352 # endif /* HAVE_PROFILING */1352 # endif /* HAVE_PROFILING */
1353diff -ruN a/mysql-test/suite/percona/include/log_grep.inc b/mysql-test/suite/percona/include/log_grep.inc
1354--- a/mysql-test/suite/percona/include/log_grep.inc 1970-01-01 03:00:00.000000000 +0300
1355+++ b/mysql-test/suite/percona/include/log_grep.inc 2011-07-08 14:17:25.170489020 +0300
1356@@ -0,0 +1,17 @@
1357+--disable_query_log
1358+--echo [log_grep.inc] file: $log_file pattern: $grep_pattern
1359+perl;
1360+ $log_file= $ENV{'log_file'};
1361+ $log_file_full_path= $ENV{'log_file_full_path'};
1362+ $grep_pattern= $ENV{'grep_pattern'};
1363+
1364+ open(FILE, "$log_file_full_path")
1365+ or die("Cannot open file $log_file_full_path: $!\n");
1366+
1367+ $lines = 0;
1368+ while(<FILE>) {
1369+ $lines++ if (/$grep_pattern/);
1370+ }
1371+ close(FILE);
1372+ print "[log_grep.inc] lines: $lines\n";
1373+EOF
1374diff -ruN a/mysql-test/suite/percona/include/log_start.inc b/mysql-test/suite/percona/include/log_start.inc
1375--- a/mysql-test/suite/percona/include/log_start.inc 1970-01-01 03:00:00.000000000 +0300
1376+++ b/mysql-test/suite/percona/include/log_start.inc 2011-07-07 14:43:22.707830029 +0300
1377@@ -0,0 +1,16 @@
1378+--disable_query_log
1379+--let log_file_full_path = $MYSQLTEST_VARDIR/$log_file
1380+SET @slow_query_log_old=@@slow_query_log;
1381+SET @slow_query_log_file_old= @@slow_query_log_file;
1382+SET GLOBAL slow_query_log=OFF;
1383+perl;
1384+ $log_file_full_path= $ENV{'log_file_full_path'};
1385+ unlink $log_file_full_path;
1386+ open(FILE, '>', $log_file_full_path)
1387+ or die "Cannot create log file $log_file_full_path, reason: $!";
1388+ close(FILE);
1389+EOF
1390+--echo [log_start.inc] $log_file
1391+EVAL SET GLOBAL slow_query_log_file="$log_file_full_path";
1392+SET GLOBAL slow_query_log=ON;
1393+--enable_query_log
1394\ No newline at end of file
1395diff -ruN a/mysql-test/suite/percona/include/log_stop.inc b/mysql-test/suite/percona/include/log_stop.inc
1396--- a/mysql-test/suite/percona/include/log_stop.inc 1970-01-01 03:00:00.000000000 +0300
1397+++ b/mysql-test/suite/percona/include/log_stop.inc 2011-07-07 14:43:13.716298077 +0300
1398@@ -0,0 +1,7 @@
1399+--disable_query_log
1400+FLUSH LOGS;
1401+SET GLOBAL slow_query_log=OFF;
1402+--echo [log_stop.inc] $log_file
1403+SET GLOBAL slow_query_log_file= @slow_query_log_file_old;
1404+SET GLOBAL slow_query_log= @slow_query_log_old;
1405+--enable_query_log
1406diff -ruN a/mysql-test/suite/percona/r/bug643149.result b/mysql-test/suite/percona/r/bug643149.result
1407--- a/mysql-test/suite/percona/r/bug643149.result 1970-01-01 03:00:00.000000000 +0300
1408+++ b/mysql-test/suite/percona/r/bug643149.result 2011-07-11 05:26:51.154662050 +0300
1409@@ -0,0 +1,21 @@
1410+SET @old_slow_query_log_file=@@global.slow_query_log_file;
1411+SET GLOBAL slow_query_log=on;
1412+SET LOCAL log_slow_verbosity='profiling';
1413+SET LOCAL long_query_time=0;
1414+SET GLOBAL slow_query_log_file='MYSQLTEST_VARDIR/percona_bug643149_slow.log';;
1415+SELECT 1;
1416+1
1417+1
1418+# User@Host: root[root] @ localhost []
1419+# Thread_id: X Schema: test Last_errno: X Killed: X
1420+# Query_time: X.X Lock_time: X.X Rows_sent: X Rows_examined: X Rows_affected: X Rows_read: X
1421+# Bytes_sent: X Tmp_tables: X Tmp_disk_tables: X Tmp_table_sizes: X
1422+# Profile_starting: X.X Profile_starting_cpu: X.X Profile_Opening_tables: X.X Profile_Opening_tables_cpu: X.X Profile_query_end: X.X Profile_query_end_cpu: X.X Profile_closing_tables: X.X Profile_closing_tables_cpu: X.X Profile_freeing_items: X.X Profile_freeing_items_cpu: X.X Profile_logging_slow_query: X.X Profile_logging_slow_query_cpu: X.X
1423+# Profile_total: X.X Profile_total_cpu: X.X
1424+# User@Host: root[root] @ localhost []
1425+# Thread_id: X Schema: test Last_errno: X Killed: X
1426+# Query_time: X.X Lock_time: X.X Rows_sent: X Rows_examined: X Rows_affected: X Rows_read: X
1427+# Bytes_sent: X Tmp_tables: X Tmp_disk_tables: X Tmp_table_sizes: X
1428+# Profile_starting: X.X Profile_starting_cpu: X.X Profile_checking_permissions: X.X Profile_checking_permissions_cpu: X.X Profile_Opening_tables: X.X Profile_Opening_tables_cpu: X.X Profile_init: X.X Profile_init_cpu: X.X Profile_optimizing: X.X Profile_optimizing_cpu: X.X Profile_executing: X.X Profile_executing_cpu: X.X Profile_end: X.X Profile_end_cpu: X.X Profile_query_end: X.X Profile_query_end_cpu: X.X Profile_closing_tables: X.X Profile_closing_tables_cpu: X.X Profile_freeing_items: X.X Profile_freeing_items_cpu: X.X Profile_logging_slow_query: X.X Profile_logging_slow_query_cpu: X.X
1429+# Profile_total: X.X Profile_total_cpu: X.X
1430+SET GLOBAL slow_query_log_file=@old_slow_query_log_file;
1431diff -ruN a/mysql-test/suite/percona/r/log_slow_filter-cl.result b/mysql-test/suite/percona/r/log_slow_filter-cl.result
1432--- a/mysql-test/suite/percona/r/log_slow_filter-cl.result 1970-01-01 03:00:00.000000000 +0300
1433+++ b/mysql-test/suite/percona/r/log_slow_filter-cl.result 2011-07-07 14:49:21.122053651 +0300
1434@@ -0,0 +1,6 @@
1435+SHOW VARIABLES LIKE 'log_slow_filter';
1436+Variable_name Value
1437+log_slow_filter full_join
1438+SHOW GLOBAL VARIABLES LIKE 'log_slow_filter';
1439+Variable_name Value
1440+log_slow_filter full_join
1441diff -ruN a/mysql-test/suite/percona/r/log_slow_filter.result b/mysql-test/suite/percona/r/log_slow_filter.result
1442--- a/mysql-test/suite/percona/r/log_slow_filter.result 1970-01-01 03:00:00.000000000 +0300
1443+++ b/mysql-test/suite/percona/r/log_slow_filter.result 2011-07-10 14:10:49.404902367 +0300
1444@@ -0,0 +1,16 @@
1445+drop table if exists t;
1446+create table t(id INT PRIMARY KEY);
1447+insert into t values(1);
1448+insert into t values(2);
1449+insert into t values(3);
1450+SET GLOBAL debug="+d,query_exec_time_debug";
1451+SET long_query_time=1;
1452+SET log_slow_filter=full_join;
1453+[log_start.inc] percona.slow_extended.log_slow_filter
1454+/* query_exec_time= "1.1" */ select * from t as t1, t as t2;
1455+[log_stop.inc] percona.slow_extended.log_slow_filter
1456+SET log_slow_filter=default;
1457+SET long_query_time=default;
1458+SET GLOBAL debug=default;
1459+[log_grep.inc] file: percona.slow_extended.log_slow_filter pattern: Query_time
1460+[log_grep.inc] lines: 1
1461diff -ruN a/mysql-test/suite/percona/r/log_slow_slave_statements-cl.result b/mysql-test/suite/percona/r/log_slow_slave_statements-cl.result
1462--- a/mysql-test/suite/percona/r/log_slow_slave_statements-cl.result 1970-01-01 03:00:00.000000000 +0300
1463+++ b/mysql-test/suite/percona/r/log_slow_slave_statements-cl.result 2011-07-08 14:40:26.982152163 +0300
1464@@ -0,0 +1,6 @@
1465+SHOW VARIABLES LIKE 'log_slow_slave_statements';
1466+Variable_name Value
1467+log_slow_slave_statements ON
1468+SHOW GLOBAL VARIABLES LIKE 'log_slow_slave_statements';
1469+Variable_name Value
1470+log_slow_slave_statements ON
1471diff -ruN a/mysql-test/suite/percona/r/log_slow_slave_statements-innodb.result b/mysql-test/suite/percona/r/log_slow_slave_statements-innodb.result
1472--- a/mysql-test/suite/percona/r/log_slow_slave_statements-innodb.result 1970-01-01 03:00:00.000000000 +0300
1473+++ b/mysql-test/suite/percona/r/log_slow_slave_statements-innodb.result 2011-07-11 04:58:27.785615103 +0300
1474@@ -0,0 +1,18 @@
1475+include/master-slave.inc
1476+[connection master]
1477+DROP TABLE IF EXISTS t;
1478+CREATE TABLE t(id INT,data CHAR(30)) ENGINE=InnoDB;
1479+INSERT INTO t VALUES
1480+(1,"aaaaabbbbbcccccdddddeeeeefffff"),
1481+(2,"aaaaabbbbbcccccdddddeeeeefffff"),
1482+(3,"aaaaabbbbbcccccdddddeeeeefffff"),
1483+(4,"aaaaabbbbbcccccdddddeeeeefffff"),
1484+(5,"aaaaabbbbbcccccdddddeeeeefffff");
1485+INSERT INTO t SELECT t2.id,t2.data from t as t1, t as t2;
1486+INSERT INTO t SELECT t2.id,t2.data from t as t1, t as t2;
1487+include/rpl_restart_server.inc [server_number=1]
1488+[log_start.inc] percona.slow_extended.log_slow_slave_statements-innodb
1489+[log_stop.inc] percona.slow_extended.log_slow_slave_statements-innodb
1490+[log_grep.inc] file: percona.slow_extended.log_slow_slave_statements-innodb pattern: InnoDB_IO_r_ops
1491+[log_grep.inc] lines: 1
1492+include/rpl_end.inc
1493diff -ruN a/mysql-test/suite/percona/r/log_slow_slave_statements.result b/mysql-test/suite/percona/r/log_slow_slave_statements.result
1494--- a/mysql-test/suite/percona/r/log_slow_slave_statements.result 1970-01-01 03:00:00.000000000 +0300
1495+++ b/mysql-test/suite/percona/r/log_slow_slave_statements.result 2011-07-08 14:36:49.718162333 +0300
1496@@ -0,0 +1,44 @@
1497+include/master-slave.inc
1498+[connection master]
1499+DROP TABLE IF EXISTS t;
1500+CREATE TABLE t(id INT);
1501+[log_start.inc] percona.slow_extended.log_slow_slave_statements
1502+LINE 1
1503+LOG_SLOW_SLAVE_STATAMENTS is OFF
1504+LOG_SLOW_SLAVE_STATEMENTS=ON
1505+LOG_SLOW_SLAVE_STATAMENTS is ON
1506+LINE 2
1507+include/restart_slave.inc
1508+LOG_SLOW_SLAVE_STATAMENTS is ON
1509+LINE 3
1510+LOG_SLOW_SLAVE_STATAMENTS is ON
1511+LOG_SLOW_SLAVE_STATEMENTS=OFF
1512+LOG_SLOW_SLAVE_STATAMENTS is OFF
1513+LINE 4
1514+include/restart_slave.inc
1515+LOG_SLOW_SLAVE_STATAMENTS is OFF
1516+LINE 5
1517+LOG_SLOW_SLAVE_STATAMENTS is OFF
1518+LOG_SLOW_SLAVE_STATEMENTS=ON
1519+LOG_SLOW_SLAVE_STATAMENTS is ON
1520+LINE 6
1521+include/restart_slave.inc
1522+LOG_SLOW_SLAVE_STATAMENTS is ON
1523+LINE 7
1524+[log_stop.inc] percona.slow_extended.log_slow_slave_statements
1525+SET GLOBAL log_slow_slave_statements=default;
1526+[log_grep.inc] file: percona.slow_extended.log_slow_slave_statements pattern: INSERT INTO t VALUES \(1\)
1527+[log_grep.inc] lines: 0
1528+[log_grep.inc] file: percona.slow_extended.log_slow_slave_statements pattern: INSERT INTO t VALUES \(2\)
1529+[log_grep.inc] lines: 0
1530+[log_grep.inc] file: percona.slow_extended.log_slow_slave_statements pattern: INSERT INTO t VALUES \(3\)
1531+[log_grep.inc] lines: 1
1532+[log_grep.inc] file: percona.slow_extended.log_slow_slave_statements pattern: INSERT INTO t VALUES \(4\)
1533+[log_grep.inc] lines: 0
1534+[log_grep.inc] file: percona.slow_extended.log_slow_slave_statements pattern: INSERT INTO t VALUES \(5\)
1535+[log_grep.inc] lines: 0
1536+[log_grep.inc] file: percona.slow_extended.log_slow_slave_statements pattern: INSERT INTO t VALUES \(6\)
1537+[log_grep.inc] lines: 0
1538+[log_grep.inc] file: percona.slow_extended.log_slow_slave_statements pattern: INSERT INTO t VALUES \(7\)
1539+[log_grep.inc] lines: 1
1540+include/rpl_end.inc
1541diff -ruN a/mysql-test/suite/percona/r/log_slow_sp_statements-cl.result b/mysql-test/suite/percona/r/log_slow_sp_statements-cl.result
1542--- a/mysql-test/suite/percona/r/log_slow_sp_statements-cl.result 1970-01-01 03:00:00.000000000 +0300
1543+++ b/mysql-test/suite/percona/r/log_slow_sp_statements-cl.result 2011-07-10 14:27:03.485102429 +0300
1544@@ -0,0 +1,6 @@
1545+SHOW VARIABLES LIKE 'log_slow_sp_statements';
1546+Variable_name Value
1547+log_slow_sp_statements ON
1548+SHOW GLOBAL VARIABLES LIKE 'log_slow_sp_statements';
1549+Variable_name Value
1550+log_slow_sp_statements ON
1551diff -ruN a/mysql-test/suite/percona/r/log_slow_sp_statements.result b/mysql-test/suite/percona/r/log_slow_sp_statements.result
1552--- a/mysql-test/suite/percona/r/log_slow_sp_statements.result 1970-01-01 03:00:00.000000000 +0300
1553+++ b/mysql-test/suite/percona/r/log_slow_sp_statements.result 2011-07-10 14:22:49.062212819 +0300
1554@@ -0,0 +1,17 @@
1555+SET GLOBAL debug="+d,query_exec_time_debug";
1556+SET long_query_time=1;
1557+SET GLOBAL log_slow_sp_statements=ON;
1558+[log_start.inc] percona.slow_extended.log_slow_sp_statements
1559+CREATE PROCEDURE test_f()
1560+BEGIN
1561+SET SESSION debug="+d,query_exec_time_1.1";
1562+SET SESSION debug="+d,query_exec_time_2.1";
1563+SET SESSION debug="+d,query_exec_time_3.1";
1564+END^
1565+CALL test_f();
1566+[log_stop.inc] percona.slow_extended.log_slow_sp_statements
1567+SET GLOBAL log_slow_sp_statements=default;
1568+SET long_query_time=default;
1569+SET GLOBAL debug=default;
1570+[log_grep.inc] file: percona.slow_extended.log_slow_sp_statements pattern: Query_time
1571+[log_grep.inc] lines: 3
1572diff -ruN a/mysql-test/suite/percona/r/log_slow_verbosity-cl.result b/mysql-test/suite/percona/r/log_slow_verbosity-cl.result
1573--- a/mysql-test/suite/percona/r/log_slow_verbosity-cl.result 1970-01-01 03:00:00.000000000 +0300
1574+++ b/mysql-test/suite/percona/r/log_slow_verbosity-cl.result 2011-07-10 14:00:40.010485607 +0300
1575@@ -0,0 +1,6 @@
1576+SHOW VARIABLES LIKE 'log_slow_verbosity';
1577+Variable_name Value
1578+log_slow_verbosity microtime,query_plan,innodb
1579+SHOW GLOBAL VARIABLES LIKE 'log_slow_verbosity';
1580+Variable_name Value
1581+log_slow_verbosity microtime,query_plan,innodb
1582diff -ruN a/mysql-test/suite/percona/r/log_slow_verbosity.result b/mysql-test/suite/percona/r/log_slow_verbosity.result
1583--- a/mysql-test/suite/percona/r/log_slow_verbosity.result 1970-01-01 03:00:00.000000000 +0300
1584+++ b/mysql-test/suite/percona/r/log_slow_verbosity.result 2011-07-10 13:56:52.465863400 +0300
1585@@ -0,0 +1,12 @@
1586+SET GLOBAL debug="+d,query_exec_time_debug";
1587+SET SESSION long_query_time=1;
1588+[log_start.inc] percona.slow_extended.log_slow_verbosity
1589+SET SESSION debug="+d,query_exec_time_2.1";
1590+SET SESSION log_slow_verbosity=innodb;
1591+SET SESSION debug="+d,query_exec_time_2.1";
1592+[log_stop.inc] percona.slow_extended.log_slow_verbosity
1593+SET log_slow_verbosity=default;
1594+SET long_query_time=default;
1595+SET GLOBAL debug=default;
1596+[log_grep.inc] file: percona.slow_extended.log_slow_verbosity pattern: No InnoDB statistics available for this query
1597+[log_grep.inc] lines: 1
1598diff -ruN a/mysql-test/suite/percona/r/long_query_time.result b/mysql-test/suite/percona/r/long_query_time.result
1599--- a/mysql-test/suite/percona/r/long_query_time.result 1970-01-01 03:00:00.000000000 +0300
1600+++ b/mysql-test/suite/percona/r/long_query_time.result 2011-07-10 14:50:59.117663773 +0300
1601@@ -0,0 +1,16 @@
1602+SET GLOBAL debug="+d,query_exec_time_debug";
1603+SET long_query_time=2;
1604+[log_start.inc] percona.slow_extended.long_query_time
1605+SET SESSION debug="+d,query_exec_time_1.1";
1606+SET SESSION debug="+d,query_exec_time_3.1";
1607+SET SESSION debug="+d,query_exec_time_5.1";
1608+SET long_query_time=4;
1609+SET SESSION debug="+d,query_exec_time_1.1";
1610+SET SESSION debug="+d,query_exec_time_3.1";
1611+SET SESSION debug="+d,query_exec_time_5.1";
1612+SET long_query_time=2;
1613+[log_stop.inc] percona.slow_extended.long_query_time
1614+SET long_query_time=default;
1615+SET GLOBAL debug=default;
1616+[log_grep.inc] file: percona.slow_extended.long_query_time pattern: Query_time
1617+[log_grep.inc] lines: 3
1618diff -ruN a/mysql-test/suite/percona/r/slow_query_log_timestamp_always-cl.result b/mysql-test/suite/percona/r/slow_query_log_timestamp_always-cl.result
1619--- a/mysql-test/suite/percona/r/slow_query_log_timestamp_always-cl.result 1970-01-01 03:00:00.000000000 +0300
1620+++ b/mysql-test/suite/percona/r/slow_query_log_timestamp_always-cl.result 2011-07-10 15:21:26.608010199 +0300
1621@@ -0,0 +1,6 @@
1622+SHOW VARIABLES LIKE 'slow_query_log_timestamp_always';
1623+Variable_name Value
1624+slow_query_log_timestamp_always ON
1625+SHOW GLOBAL VARIABLES LIKE 'slow_query_log_timestamp_always';
1626+Variable_name Value
1627+slow_query_log_timestamp_always ON
1628diff -ruN a/mysql-test/suite/percona/r/slow_query_log_timestamp_always.result b/mysql-test/suite/percona/r/slow_query_log_timestamp_always.result
1629--- a/mysql-test/suite/percona/r/slow_query_log_timestamp_always.result 1970-01-01 03:00:00.000000000 +0300
1630+++ b/mysql-test/suite/percona/r/slow_query_log_timestamp_always.result 2011-07-10 15:22:19.809393331 +0300
1631@@ -0,0 +1,21 @@
1632+SET GLOBAL debug="+d,query_exec_time_debug";
1633+SET long_query_time=2;
1634+SET GLOBAL slow_query_log_timestamp_always=ON;
1635+[log_start.inc] percona.slow_extended.slow_query_log_timestamp_always
1636+SET SESSION debug="+d,query_exec_time_2.1";
1637+SET SESSION debug="+d,query_exec_time_2.1";
1638+SET SESSION debug="+d,query_exec_time_2.1";
1639+SET GLOBAL slow_query_log_timestamp_always=OFF;
1640+SET SESSION debug="+d,query_exec_time_2.1";
1641+SET SESSION debug="+d,query_exec_time_2.1";
1642+SET SESSION debug="+d,query_exec_time_2.1";
1643+SET GLOBAL slow_query_log_timestamp_always=ON;
1644+SET SESSION debug="+d,query_exec_time_2.1";
1645+SET SESSION debug="+d,query_exec_time_2.1";
1646+SET SESSION debug="+d,query_exec_time_2.1";
1647+[log_stop.inc] percona.slow_extended.slow_query_log_timestamp_always
1648+SET GLOBAL slow_query_log_timestamp_always=default;
1649+SET long_query_time=default;
1650+SET GLOBAL debug=default;
1651+[log_grep.inc] file: percona.slow_extended.slow_query_log_timestamp_always pattern: # Time: [0-9]+[ ]+[0-9]+:[0-9]+:[0-9]+
1652+[log_grep.inc] lines: 6
1653diff -ruN a/mysql-test/suite/percona/r/slow_query_log_timestamp_precision-cl.result b/mysql-test/suite/percona/r/slow_query_log_timestamp_precision-cl.result
1654--- a/mysql-test/suite/percona/r/slow_query_log_timestamp_precision-cl.result 1970-01-01 03:00:00.000000000 +0300
1655+++ b/mysql-test/suite/percona/r/slow_query_log_timestamp_precision-cl.result 2011-07-10 15:10:32.182262120 +0300
1656@@ -0,0 +1,6 @@
1657+SHOW VARIABLES LIKE 'slow_query_log_timestamp_precision';
1658+Variable_name Value
1659+slow_query_log_timestamp_precision microsecond
1660+SHOW GLOBAL VARIABLES LIKE 'slow_query_log_timestamp_precision';
1661+Variable_name Value
1662+slow_query_log_timestamp_precision microsecond
1663diff -ruN a/mysql-test/suite/percona/r/slow_query_log_timestamp_precision.result b/mysql-test/suite/percona/r/slow_query_log_timestamp_precision.result
1664--- a/mysql-test/suite/percona/r/slow_query_log_timestamp_precision.result 1970-01-01 03:00:00.000000000 +0300
1665+++ b/mysql-test/suite/percona/r/slow_query_log_timestamp_precision.result 2011-07-10 15:14:36.513042726 +0300
1666@@ -0,0 +1,14 @@
1667+SET GLOBAL debug="+d,query_exec_time_debug";
1668+SET long_query_time=2;
1669+[log_start.inc] percona.slow_extended.slow_query_log_timestamp_precision
1670+SET SESSION debug="+d,query_exec_time_2.1";
1671+SET GLOBAL slow_query_log_timestamp_precision='microsecond';
1672+SET SESSION debug="+d,query_exec_time_2.1";
1673+[log_stop.inc] percona.slow_extended.slow_query_log_timestamp_precision
1674+SET GLOBAL slow_query_log_timestamp_precision=default;
1675+SET long_query_time=default;
1676+SET GLOBAL debug=default;
1677+[log_grep.inc] file: percona.slow_extended.slow_query_log_timestamp_precision pattern: # Time: [0-9]+[ ]+[0-9]+:[0-9]+:[0-9]+.[0-9]+
1678+[log_grep.inc] lines: 1
1679+[log_grep.inc] file: percona.slow_extended.slow_query_log_timestamp_precision pattern: # Time: [0-9]+[ ]+[0-9]+:[0-9]+:[0-9]+
1680+[log_grep.inc] lines: 2
1681diff -ruN a/mysql-test/suite/percona/r/slow_query_log_use_global_control.result b/mysql-test/suite/percona/r/slow_query_log_use_global_control.result
1682--- a/mysql-test/suite/percona/r/slow_query_log_use_global_control.result 1970-01-01 03:00:00.000000000 +0300
1683+++ b/mysql-test/suite/percona/r/slow_query_log_use_global_control.result 2011-07-11 05:17:57.097878977 +0300
1684@@ -0,0 +1,14 @@
1685+SET GLOBAL debug="+d,query_exec_time_debug";
1686+SET GLOBAL long_query_time=1;
1687+[log_start.inc] percona.slow_extended.slow_query_log_use_global_control
1688+SET SESSION debug="+d,query_exec_time_1.1";
1689+SET GLOBAL log_slow_verbosity=innodb;
1690+SET GLOBAL slow_query_log_use_global_control="log_slow_verbosity,long_query_time";
1691+SET SESSION debug="+d,query_exec_time_1.1";
1692+[log_stop.inc] percona.slow_extended.slow_query_log_use_global_control
1693+SET GLOBAL slow_query_log_use_global_control=default;
1694+SET GLOBAL log_slow_verbosity=default;
1695+SET GLOBAL long_query_time=default;
1696+SET GLOBAL debug=default;
1697+[log_grep.inc] file: percona.slow_extended.slow_query_log_use_global_control pattern: No InnoDB statistics available for this query
1698+[log_grep.inc] lines: 1
1699diff -ruN a/mysql-test/suite/percona/t/bug643149.test b/mysql-test/suite/percona/t/bug643149.test
1700--- a/mysql-test/suite/percona/t/bug643149.test 1970-01-01 03:00:00.000000000 +0300
1701+++ b/mysql-test/suite/percona/t/bug643149.test 2011-07-07 13:04:58.695478330 +0300
1702@@ -0,0 +1,49 @@
1703+#
1704+# This test suffers from server
1705+# Bug#38124 "general_log_file" variable silently unset when using expression
1706+# In short:
1707+# SET GLOBAL general_log_file = @<whatever>
1708+# SET GLOBAL slow_query_log = @<whatever>
1709+# cause that the value of these server system variables is set to default
1710+# instead of the assigned values. There comes no error message or warning.
1711+# If this bug is fixed please
1712+# 1. try this test with "let $fixed_bug38124 = 0;"
1713+# 2. remove all workarounds if 1. was successful.
1714+--source include/have_profiling.inc
1715+let $fixed_bug38124 = 0;
1716+
1717+SET @old_slow_query_log_file=@@global.slow_query_log_file;
1718+SET GLOBAL slow_query_log=on;
1719+SET LOCAL log_slow_verbosity='profiling';
1720+SET LOCAL long_query_time=0;
1721+
1722+let slogfile=$MYSQLTEST_VARDIR/percona_bug643149_slow.log;
1723+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
1724+--eval SET GLOBAL slow_query_log_file='$slogfile';
1725+
1726+SELECT 1;
1727+
1728+perl;
1729+ $slogfile= $ENV{'slogfile'};
1730+
1731+ open(FILE, "$slogfile") or
1732+ die("Unable to read slow query log file $slogfile: $!\n");
1733+ while(<FILE>) {
1734+ next if (!/^#/);
1735+ next if (/^# Time:/);
1736+ s/[0-9]+/X/g;
1737+ print;
1738+ }
1739+
1740+ close(FILE);
1741+EOF
1742+
1743+SET GLOBAL slow_query_log_file=@old_slow_query_log_file;
1744+
1745+if(!$fixed_bug38124)
1746+{
1747+ --disable_query_log
1748+ let $my_var = `SELECT @old_slow_query_log_file`;
1749+ eval SET @@global.slow_query_log_file = '$my_var';
1750+ --enable_query_log
1751+}
1752diff -ruN a/mysql-test/suite/percona/t/log_slow_filter-cl-master.opt b/mysql-test/suite/percona/t/log_slow_filter-cl-master.opt
1753--- a/mysql-test/suite/percona/t/log_slow_filter-cl-master.opt 1970-01-01 03:00:00.000000000 +0300
1754+++ b/mysql-test/suite/percona/t/log_slow_filter-cl-master.opt 2011-07-07 14:48:11.661928208 +0300
1755@@ -0,0 +1 @@
1756+--log_slow_filter=full_join
1757diff -ruN a/mysql-test/suite/percona/t/log_slow_filter-cl.test b/mysql-test/suite/percona/t/log_slow_filter-cl.test
1758--- a/mysql-test/suite/percona/t/log_slow_filter-cl.test 1970-01-01 03:00:00.000000000 +0300
1759+++ b/mysql-test/suite/percona/t/log_slow_filter-cl.test 2011-07-10 15:08:39.046434227 +0300
1760@@ -0,0 +1,2 @@
1761+SHOW VARIABLES LIKE 'log_slow_filter';
1762+SHOW GLOBAL VARIABLES LIKE 'log_slow_filter';
1763diff -ruN a/mysql-test/suite/percona/t/log_slow_filter.test b/mysql-test/suite/percona/t/log_slow_filter.test
1764--- a/mysql-test/suite/percona/t/log_slow_filter.test 1970-01-01 03:00:00.000000000 +0300
1765+++ b/mysql-test/suite/percona/t/log_slow_filter.test 2011-07-10 14:09:14.477193982 +0300
1766@@ -0,0 +1,30 @@
1767+--source include/have_debug.inc
1768+
1769+--disable_warnings
1770+drop table if exists t;
1771+--enable_warnings
1772+
1773+create table t(id INT PRIMARY KEY);
1774+insert into t values(1);
1775+insert into t values(2);
1776+insert into t values(3);
1777+
1778+SET GLOBAL debug="+d,query_exec_time_debug";
1779+SET long_query_time=1;
1780+SET log_slow_filter=full_join;
1781+--let log_file=percona.slow_extended.log_slow_filter
1782+--source suite/percona/include/log_start.inc
1783+
1784+--disable_result_log
1785+/* query_exec_time= "1.1" */ select * from t as t1, t as t2;
1786+--enable_result_log
1787+
1788+--source suite/percona/include/log_stop.inc
1789+SET log_slow_filter=default;
1790+SET long_query_time=default;
1791+SET GLOBAL debug=default;
1792+
1793+--let grep_pattern = Query_time
1794+--source suite/percona/include/log_grep.inc
1795+
1796+DROP TABLE t;
1797diff -ruN a/mysql-test/suite/percona/t/log_slow_slave_statements-cl-master.opt b/mysql-test/suite/percona/t/log_slow_slave_statements-cl-master.opt
1798--- a/mysql-test/suite/percona/t/log_slow_slave_statements-cl-master.opt 1970-01-01 03:00:00.000000000 +0300
1799+++ b/mysql-test/suite/percona/t/log_slow_slave_statements-cl-master.opt 2011-07-08 14:39:15.104855022 +0300
1800@@ -0,0 +1 @@
1801+--log_slow_slave_statements
1802\ No newline at end of file
1803diff -ruN a/mysql-test/suite/percona/t/log_slow_slave_statements-cl.test b/mysql-test/suite/percona/t/log_slow_slave_statements-cl.test
1804--- a/mysql-test/suite/percona/t/log_slow_slave_statements-cl.test 1970-01-01 03:00:00.000000000 +0300
1805+++ b/mysql-test/suite/percona/t/log_slow_slave_statements-cl.test 2011-07-08 14:39:40.976401766 +0300
1806@@ -0,0 +1,3 @@
1807+SHOW VARIABLES LIKE 'log_slow_slave_statements';
1808+SHOW GLOBAL VARIABLES LIKE 'log_slow_slave_statements';
1809+
1810diff -ruN a/mysql-test/suite/percona/t/log_slow_slave_statements-innodb-slave.opt b/mysql-test/suite/percona/t/log_slow_slave_statements-innodb-slave.opt
1811--- a/mysql-test/suite/percona/t/log_slow_slave_statements-innodb-slave.opt 1970-01-01 03:00:00.000000000 +0300
1812+++ b/mysql-test/suite/percona/t/log_slow_slave_statements-innodb-slave.opt 2011-07-11 01:09:33.062030061 +0300
1813@@ -0,0 +1 @@
1814+--long_query_time=0 --log_slow_slave_statements --log_slow_verbosity=innodb
1815\ No newline at end of file
1816diff -ruN a/mysql-test/suite/percona/t/log_slow_slave_statements-innodb.test b/mysql-test/suite/percona/t/log_slow_slave_statements-innodb.test
1817--- a/mysql-test/suite/percona/t/log_slow_slave_statements-innodb.test 1970-01-01 03:00:00.000000000 +0300
1818+++ b/mysql-test/suite/percona/t/log_slow_slave_statements-innodb.test 2011-07-11 04:54:53.629106181 +0300
1819@@ -0,0 +1,48 @@
1820+--source include/have_binlog_format_statement.inc
1821+--source include/master-slave.inc
1822+--source include/have_innodb.inc
1823+--let log_file=percona.slow_extended.log_slow_slave_statements-innodb
1824+
1825+connection master;
1826+-- disable_warnings
1827+DROP TABLE IF EXISTS t;
1828+-- enable_warnings
1829+
1830+CREATE TABLE t(id INT,data CHAR(30)) ENGINE=InnoDB;
1831+INSERT INTO t VALUES
1832+(1,"aaaaabbbbbcccccdddddeeeeefffff"),
1833+(2,"aaaaabbbbbcccccdddddeeeeefffff"),
1834+(3,"aaaaabbbbbcccccdddddeeeeefffff"),
1835+(4,"aaaaabbbbbcccccdddddeeeeefffff"),
1836+(5,"aaaaabbbbbcccccdddddeeeeefffff");
1837+INSERT INTO t SELECT t2.id,t2.data from t as t1, t as t2;
1838+INSERT INTO t SELECT t2.id,t2.data from t as t1, t as t2;
1839+sync_slave_with_master;
1840+
1841+--let rpl_server_number=1
1842+--source include/rpl_restart_server.inc
1843+
1844+connection slave;
1845+--source suite/percona/include/log_start.inc
1846+
1847+--disable_query_log
1848+--disable_result_log
1849+
1850+connection master;
1851+INSERT INTO t SELECT t.id,t.data from t;
1852+sync_slave_with_master;
1853+
1854+connection slave;
1855+--source suite/percona/include/log_stop.inc
1856+
1857+--enable_query_log
1858+--enable_result_log
1859+
1860+--let grep_pattern = InnoDB_IO_r_ops
1861+--source suite/percona/include/log_grep.inc
1862+
1863+connection master;
1864+DROP TABLE t;
1865+sync_slave_with_master;
1866+
1867+--source include/rpl_end.inc
1868diff -ruN a/mysql-test/suite/percona/t/log_slow_slave_statements-slave.opt b/mysql-test/suite/percona/t/log_slow_slave_statements-slave.opt
1869--- a/mysql-test/suite/percona/t/log_slow_slave_statements-slave.opt 1970-01-01 03:00:00.000000000 +0300
1870+++ b/mysql-test/suite/percona/t/log_slow_slave_statements-slave.opt 2011-07-08 13:32:25.331972123 +0300
1871@@ -0,0 +1 @@
1872+--long_query_time=0
1873\ No newline at end of file
1874diff -ruN a/mysql-test/suite/percona/t/log_slow_slave_statements.test b/mysql-test/suite/percona/t/log_slow_slave_statements.test
1875--- a/mysql-test/suite/percona/t/log_slow_slave_statements.test 1970-01-01 03:00:00.000000000 +0300
1876+++ b/mysql-test/suite/percona/t/log_slow_slave_statements.test 2011-07-08 14:35:51.704693389 +0300
1877@@ -0,0 +1,117 @@
1878+-- source include/have_binlog_format_statement.inc
1879+-- source include/master-slave.inc
1880+--let log_file=percona.slow_extended.log_slow_slave_statements
1881+--let show=SELECT Variable_value FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE Variable_name LIKE 'log_slow_slave_statements';
1882+
1883+connection master;
1884+-- disable_warnings
1885+DROP TABLE IF EXISTS t;
1886+-- enable_warnings
1887+
1888+CREATE TABLE t(id INT);
1889+sync_slave_with_master;
1890+
1891+connection slave;
1892+--source suite/percona/include/log_start.inc
1893+
1894+--disable_query_log
1895+--disable_result_log
1896+
1897+--echo LINE 1
1898+connection master;
1899+INSERT INTO t VALUES (1);
1900+sync_slave_with_master;
1901+
1902+connection slave;
1903+--let value=`$show`
1904+--echo LOG_SLOW_SLAVE_STATAMENTS is $value
1905+--echo LOG_SLOW_SLAVE_STATEMENTS=ON
1906+SET GLOBAL log_slow_slave_statements=ON;
1907+--let value=`$show`
1908+--echo LOG_SLOW_SLAVE_STATAMENTS is $value
1909+
1910+--echo LINE 2
1911+connection master;
1912+INSERT INTO t VALUES (2);
1913+sync_slave_with_master;
1914+
1915+--source include/restart_slave_sql.inc
1916+
1917+connection slave;
1918+--let value=`$show`
1919+--echo LOG_SLOW_SLAVE_STATAMENTS is $value
1920+
1921+--echo LINE 3
1922+connection master;
1923+INSERT INTO t VALUES (3);
1924+sync_slave_with_master;
1925+
1926+connection slave;
1927+--let value=`$show`
1928+--echo LOG_SLOW_SLAVE_STATAMENTS is $value
1929+--echo LOG_SLOW_SLAVE_STATEMENTS=OFF
1930+SET GLOBAL log_slow_slave_statements=OFF;
1931+--let value=`$show`
1932+--echo LOG_SLOW_SLAVE_STATAMENTS is $value
1933+
1934+--echo LINE 4
1935+connection master;
1936+INSERT INTO t VALUES (4);
1937+sync_slave_with_master;
1938+
1939+--source include/restart_slave_sql.inc
1940+
1941+connection slave;
1942+--let value=`$show`
1943+--echo LOG_SLOW_SLAVE_STATAMENTS is $value
1944+
1945+--echo LINE 5
1946+connection master;
1947+INSERT INTO t VALUES (5);
1948+sync_slave_with_master;
1949+
1950+connection slave;
1951+--let value=`$show`
1952+--echo LOG_SLOW_SLAVE_STATAMENTS is $value
1953+--echo LOG_SLOW_SLAVE_STATEMENTS=ON
1954+SET GLOBAL log_slow_slave_statements=ON;
1955+--let value=`$show`
1956+--echo LOG_SLOW_SLAVE_STATAMENTS is $value
1957+
1958+--echo LINE 6
1959+connection master;
1960+INSERT INTO t VALUES (6);
1961+sync_slave_with_master;
1962+
1963+--source include/restart_slave_sql.inc
1964+
1965+connection slave;
1966+--let value=`$show`
1967+--echo LOG_SLOW_SLAVE_STATAMENTS is $value
1968+
1969+--echo LINE 7
1970+connection master;
1971+INSERT INTO t VALUES (7);
1972+sync_slave_with_master;
1973+
1974+--enable_query_log
1975+--enable_result_log
1976+
1977+connection slave;
1978+--source suite/percona/include/log_stop.inc
1979+SET GLOBAL log_slow_slave_statements=default;
1980+
1981+connection slave;
1982+--let i=1
1983+while($i < 8)
1984+{
1985+--let grep_pattern= INSERT INTO t VALUES \($i\)
1986+--source suite/percona/include/log_grep.inc
1987+ inc $i;
1988+}
1989+
1990+connection master;
1991+DROP TABLE t;
1992+sync_slave_with_master;
1993+
1994+--source include/rpl_end.inc
1995diff -ruN a/mysql-test/suite/percona/t/log_slow_sp_statements-cl-master.opt b/mysql-test/suite/percona/t/log_slow_sp_statements-cl-master.opt
1996--- a/mysql-test/suite/percona/t/log_slow_sp_statements-cl-master.opt 1970-01-01 03:00:00.000000000 +0300
1997+++ b/mysql-test/suite/percona/t/log_slow_sp_statements-cl-master.opt 2011-07-07 13:05:54.830791335 +0300
1998@@ -0,0 +1 @@
1999+--log_slow_sp_statements
2000diff -ruN a/mysql-test/suite/percona/t/log_slow_sp_statements-cl.test b/mysql-test/suite/percona/t/log_slow_sp_statements-cl.test
2001--- a/mysql-test/suite/percona/t/log_slow_sp_statements-cl.test 1970-01-01 03:00:00.000000000 +0300
2002+++ b/mysql-test/suite/percona/t/log_slow_sp_statements-cl.test 2011-07-10 14:25:08.836249022 +0300
2003@@ -0,0 +1,2 @@
2004+SHOW VARIABLES LIKE 'log_slow_sp_statements';
2005+SHOW GLOBAL VARIABLES LIKE 'log_slow_sp_statements';
2006diff -ruN a/mysql-test/suite/percona/t/log_slow_sp_statements.test b/mysql-test/suite/percona/t/log_slow_sp_statements.test
2007--- a/mysql-test/suite/percona/t/log_slow_sp_statements.test 1970-01-01 03:00:00.000000000 +0300
2008+++ b/mysql-test/suite/percona/t/log_slow_sp_statements.test 2011-07-10 14:21:58.936846159 +0300
2009@@ -0,0 +1,28 @@
2010+--source include/have_debug.inc
2011+
2012+SET GLOBAL debug="+d,query_exec_time_debug";
2013+SET long_query_time=1;
2014+SET GLOBAL log_slow_sp_statements=ON;
2015+--let log_file=percona.slow_extended.log_slow_sp_statements
2016+--source suite/percona/include/log_start.inc
2017+
2018+delimiter ^;
2019+CREATE PROCEDURE test_f()
2020+BEGIN
2021+ SET SESSION debug="+d,query_exec_time_1.1";
2022+ SET SESSION debug="+d,query_exec_time_2.1";
2023+ SET SESSION debug="+d,query_exec_time_3.1";
2024+END^
2025+delimiter ;^
2026+
2027+CALL test_f();
2028+
2029+--source suite/percona/include/log_stop.inc
2030+SET GLOBAL log_slow_sp_statements=default;
2031+SET long_query_time=default;
2032+SET GLOBAL debug=default;
2033+
2034+--let grep_pattern = Query_time
2035+--source suite/percona/include/log_grep.inc
2036+
2037+DROP PROCEDURE test_f;
2038diff -ruN a/mysql-test/suite/percona/t/log_slow_verbosity-cl-master.opt b/mysql-test/suite/percona/t/log_slow_verbosity-cl-master.opt
2039--- a/mysql-test/suite/percona/t/log_slow_verbosity-cl-master.opt 1970-01-01 03:00:00.000000000 +0300
2040+++ b/mysql-test/suite/percona/t/log_slow_verbosity-cl-master.opt 2011-07-07 13:05:54.830791335 +0300
2041@@ -0,0 +1 @@
2042+--log_slow_verbosity="full"
2043diff -ruN a/mysql-test/suite/percona/t/log_slow_verbosity-cl.test b/mysql-test/suite/percona/t/log_slow_verbosity-cl.test
2044--- a/mysql-test/suite/percona/t/log_slow_verbosity-cl.test 1970-01-01 03:00:00.000000000 +0300
2045+++ b/mysql-test/suite/percona/t/log_slow_verbosity-cl.test 2011-07-10 13:59:17.231896298 +0300
2046@@ -0,0 +1,2 @@
2047+SHOW VARIABLES LIKE 'log_slow_verbosity';
2048+SHOW GLOBAL VARIABLES LIKE 'log_slow_verbosity';
2049diff -ruN a/mysql-test/suite/percona/t/log_slow_verbosity.test b/mysql-test/suite/percona/t/log_slow_verbosity.test
2050--- a/mysql-test/suite/percona/t/log_slow_verbosity.test 1970-01-01 03:00:00.000000000 +0300
2051+++ b/mysql-test/suite/percona/t/log_slow_verbosity.test 2011-07-10 13:56:25.942673837 +0300
2052@@ -0,0 +1,19 @@
2053+--source include/have_innodb.inc
2054+--source include/have_debug.inc
2055+
2056+SET GLOBAL debug="+d,query_exec_time_debug";
2057+SET SESSION long_query_time=1;
2058+--let log_file=percona.slow_extended.log_slow_verbosity
2059+--source suite/percona/include/log_start.inc
2060+
2061+SET SESSION debug="+d,query_exec_time_2.1";
2062+SET SESSION log_slow_verbosity=innodb;
2063+SET SESSION debug="+d,query_exec_time_2.1";
2064+
2065+--source suite/percona/include/log_stop.inc
2066+SET log_slow_verbosity=default;
2067+SET long_query_time=default;
2068+SET GLOBAL debug=default;
2069+
2070+--let grep_pattern = No InnoDB statistics available for this query
2071+--source suite/percona/include/log_grep.inc
2072diff -ruN a/mysql-test/suite/percona/t/long_query_time.test b/mysql-test/suite/percona/t/long_query_time.test
2073--- a/mysql-test/suite/percona/t/long_query_time.test 1970-01-01 03:00:00.000000000 +0300
2074+++ b/mysql-test/suite/percona/t/long_query_time.test 2011-07-10 14:49:26.027981585 +0300
2075@@ -0,0 +1,25 @@
2076+--source include/have_debug.inc
2077+
2078+SET GLOBAL debug="+d,query_exec_time_debug";
2079+SET long_query_time=2;
2080+--let log_file=percona.slow_extended.long_query_time
2081+--source suite/percona/include/log_start.inc
2082+
2083+SET SESSION debug="+d,query_exec_time_1.1";
2084+SET SESSION debug="+d,query_exec_time_3.1";
2085+SET SESSION debug="+d,query_exec_time_5.1";
2086+
2087+SET long_query_time=4;
2088+
2089+SET SESSION debug="+d,query_exec_time_1.1";
2090+SET SESSION debug="+d,query_exec_time_3.1";
2091+SET SESSION debug="+d,query_exec_time_5.1";
2092+
2093+SET long_query_time=2;
2094+
2095+--source suite/percona/include/log_stop.inc
2096+SET long_query_time=default;
2097+SET GLOBAL debug=default;
2098+
2099+--let grep_pattern = Query_time
2100+--source suite/percona/include/log_grep.inc
2101diff -ruN a/mysql-test/suite/percona/t/slow_query_log_timestamp_always-cl-master.opt b/mysql-test/suite/percona/t/slow_query_log_timestamp_always-cl-master.opt
2102--- a/mysql-test/suite/percona/t/slow_query_log_timestamp_always-cl-master.opt 1970-01-01 03:00:00.000000000 +0300
2103+++ b/mysql-test/suite/percona/t/slow_query_log_timestamp_always-cl-master.opt 2011-07-10 15:18:44.781842258 +0300
2104@@ -0,0 +1 @@
2105+--slow_query_log_timestamp_always
2106\ No newline at end of file
2107diff -ruN a/mysql-test/suite/percona/t/slow_query_log_timestamp_always-cl.test b/mysql-test/suite/percona/t/slow_query_log_timestamp_always-cl.test
2108--- a/mysql-test/suite/percona/t/slow_query_log_timestamp_always-cl.test 1970-01-01 03:00:00.000000000 +0300
2109+++ b/mysql-test/suite/percona/t/slow_query_log_timestamp_always-cl.test 2011-07-10 15:18:59.452948303 +0300
2110@@ -0,0 +1,2 @@
2111+SHOW VARIABLES LIKE 'slow_query_log_timestamp_always';
2112+SHOW GLOBAL VARIABLES LIKE 'slow_query_log_timestamp_always';
2113diff -ruN a/mysql-test/suite/percona/t/slow_query_log_timestamp_always.test b/mysql-test/suite/percona/t/slow_query_log_timestamp_always.test
2114--- a/mysql-test/suite/percona/t/slow_query_log_timestamp_always.test 1970-01-01 03:00:00.000000000 +0300
2115+++ b/mysql-test/suite/percona/t/slow_query_log_timestamp_always.test 2011-07-10 15:19:36.705217424 +0300
2116@@ -0,0 +1,31 @@
2117+--source include/have_debug.inc
2118+
2119+SET GLOBAL debug="+d,query_exec_time_debug";
2120+SET long_query_time=2;
2121+SET GLOBAL slow_query_log_timestamp_always=ON;
2122+--let log_file=percona.slow_extended.slow_query_log_timestamp_always
2123+--source suite/percona/include/log_start.inc
2124+
2125+SET SESSION debug="+d,query_exec_time_2.1";
2126+SET SESSION debug="+d,query_exec_time_2.1";
2127+SET SESSION debug="+d,query_exec_time_2.1";
2128+
2129+SET GLOBAL slow_query_log_timestamp_always=OFF;
2130+
2131+SET SESSION debug="+d,query_exec_time_2.1";
2132+SET SESSION debug="+d,query_exec_time_2.1";
2133+SET SESSION debug="+d,query_exec_time_2.1";
2134+
2135+SET GLOBAL slow_query_log_timestamp_always=ON;
2136+
2137+SET SESSION debug="+d,query_exec_time_2.1";
2138+SET SESSION debug="+d,query_exec_time_2.1";
2139+SET SESSION debug="+d,query_exec_time_2.1";
2140+
2141+--source suite/percona/include/log_stop.inc
2142+SET GLOBAL slow_query_log_timestamp_always=default;
2143+SET long_query_time=default;
2144+SET GLOBAL debug=default;
2145+
2146+--let grep_pattern = # Time: [0-9]+[ ]+[0-9]+:[0-9]+:[0-9]+
2147+--source suite/percona/include/log_grep.inc
2148diff -ruN a/mysql-test/suite/percona/t/slow_query_log_timestamp_precision-cl-master.opt b/mysql-test/suite/percona/t/slow_query_log_timestamp_precision-cl-master.opt
2149--- a/mysql-test/suite/percona/t/slow_query_log_timestamp_precision-cl-master.opt 1970-01-01 03:00:00.000000000 +0300
2150+++ b/mysql-test/suite/percona/t/slow_query_log_timestamp_precision-cl-master.opt 2011-07-10 15:09:42.163896373 +0300
2151@@ -0,0 +1 @@
2152+--slow_query_log_timestamp_precision='microsecond'
2153\ No newline at end of file
2154diff -ruN a/mysql-test/suite/percona/t/slow_query_log_timestamp_precision-cl.test b/mysql-test/suite/percona/t/slow_query_log_timestamp_precision-cl.test
2155--- a/mysql-test/suite/percona/t/slow_query_log_timestamp_precision-cl.test 1970-01-01 03:00:00.000000000 +0300
2156+++ b/mysql-test/suite/percona/t/slow_query_log_timestamp_precision-cl.test 2011-07-10 15:18:32.407752792 +0300
2157@@ -0,0 +1,2 @@
2158+SHOW VARIABLES LIKE 'slow_query_log_timestamp_precision';
2159+SHOW GLOBAL VARIABLES LIKE 'slow_query_log_timestamp_precision';
2160diff -ruN a/mysql-test/suite/percona/t/slow_query_log_timestamp_precision-master.opt b/mysql-test/suite/percona/t/slow_query_log_timestamp_precision-master.opt
2161--- a/mysql-test/suite/percona/t/slow_query_log_timestamp_precision-master.opt 1970-01-01 03:00:00.000000000 +0300
2162+++ b/mysql-test/suite/percona/t/slow_query_log_timestamp_precision-master.opt 2011-07-10 15:14:07.350830716 +0300
2163@@ -0,0 +1 @@
2164+--slow_query_log_timestamp_always
2165\ No newline at end of file
2166diff -ruN a/mysql-test/suite/percona/t/slow_query_log_timestamp_precision.test b/mysql-test/suite/percona/t/slow_query_log_timestamp_precision.test
2167--- a/mysql-test/suite/percona/t/slow_query_log_timestamp_precision.test 1970-01-01 03:00:00.000000000 +0300
2168+++ b/mysql-test/suite/percona/t/slow_query_log_timestamp_precision.test 2011-07-10 15:16:09.186715575 +0300
2169@@ -0,0 +1,23 @@
2170+--source include/have_debug.inc
2171+
2172+SET GLOBAL debug="+d,query_exec_time_debug";
2173+SET long_query_time=2;
2174+--let log_file=percona.slow_extended.slow_query_log_timestamp_precision
2175+--source suite/percona/include/log_start.inc
2176+
2177+SET SESSION debug="+d,query_exec_time_2.1";
2178+
2179+SET GLOBAL slow_query_log_timestamp_precision='microsecond';
2180+
2181+SET SESSION debug="+d,query_exec_time_2.1";
2182+
2183+--source suite/percona/include/log_stop.inc
2184+SET GLOBAL slow_query_log_timestamp_precision=default;
2185+SET long_query_time=default;
2186+SET GLOBAL debug=default;
2187+
2188+--let grep_pattern = # Time: [0-9]+[ ]+[0-9]+:[0-9]+:[0-9]+.[0-9]+
2189+--source suite/percona/include/log_grep.inc
2190+
2191+--let grep_pattern = # Time: [0-9]+[ ]+[0-9]+:[0-9]+:[0-9]+
2192+--source suite/percona/include/log_grep.inc
2193diff -ruN a/mysql-test/suite/percona/t/slow_query_log_use_global_control.test b/mysql-test/suite/percona/t/slow_query_log_use_global_control.test
2194--- a/mysql-test/suite/percona/t/slow_query_log_use_global_control.test 1970-01-01 03:00:00.000000000 +0300
2195+++ b/mysql-test/suite/percona/t/slow_query_log_use_global_control.test 2011-07-11 05:17:32.388704042 +0300
2196@@ -0,0 +1,26 @@
2197+--source include/have_debug.inc
2198+--source include/have_innodb.inc
2199+
2200+SET GLOBAL debug="+d,query_exec_time_debug";
2201+SET GLOBAL long_query_time=1;
2202+
2203+--let log_file=percona.slow_extended.slow_query_log_use_global_control
2204+--source suite/percona/include/log_start.inc
2205+
2206+SET SESSION debug="+d,query_exec_time_1.1";
2207+
2208+SET GLOBAL log_slow_verbosity=innodb;
2209+SET GLOBAL slow_query_log_use_global_control="log_slow_verbosity,long_query_time";
2210+
2211+SET SESSION debug="+d,query_exec_time_1.1";
2212+
2213+--source suite/percona/include/log_stop.inc
2214+
2215+SET GLOBAL slow_query_log_use_global_control=default;
2216+SET GLOBAL log_slow_verbosity=default;
2217+SET GLOBAL long_query_time=default;
2218+SET GLOBAL debug=default;
2219+
2220+--let grep_pattern = No InnoDB statistics available for this query
2221+--source suite/percona/include/log_grep.inc
2222+
2223diff -ruN a/mysql-test/suite/percona/r/slow_query_log_use_global_control-cl.result b/mysql-test/suite/percona/r/slow_query_log_use_global_control-cl.result
2224--- a/mysql-test/suite/percona/r/slow_query_log_use_global_control-cl.result 1970-01-01 03:00:00.000000000 +0300
2225+++ b/mysql-test/suite/percona/r/slow_query_log_use_global_control-cl.result 2011-07-11 05:43:50.429882795 +0300
2226@@ -0,0 +1,6 @@
2227+SHOW VARIABLES LIKE 'slow_query_log_use_global_control';
2228+Variable_name Value
2229+slow_query_log_use_global_control log_slow_verbosity,long_query_time
2230+SHOW GLOBAL VARIABLES LIKE 'slow_query_log_use_global_control';
2231+Variable_name Value
2232+slow_query_log_use_global_control log_slow_verbosity,long_query_time
2233diff -ruN a/mysql-test/suite/percona/t/slow_query_log_use_global_control-cl-master.opt b/mysql-test/suite/percona/t/slow_query_log_use_global_control-cl-master.opt
2234--- a/mysql-test/suite/percona/t/slow_query_log_use_global_control-cl-master.opt 1970-01-01 03:00:00.000000000 +0300
2235+++ b/mysql-test/suite/percona/t/slow_query_log_use_global_control-cl-master.opt 2011-07-11 05:42:43.191407676 +0300
2236@@ -0,0 +1 @@
2237+--slow_query_log_use_global_control="log_slow_verbosity,long_query_time"
2238diff -ruN a/mysql-test/suite/percona/t/slow_query_log_use_global_control-cl.test b/mysql-test/suite/percona/t/slow_query_log_use_global_control-cl.test
2239--- a/mysql-test/suite/percona/t/slow_query_log_use_global_control-cl.test 1970-01-01 03:00:00.000000000 +0300
2240+++ b/mysql-test/suite/percona/t/slow_query_log_use_global_control-cl.test 2011-07-11 05:43:08.241584679 +0300
2241@@ -0,0 +1,2 @@
2242+SHOW VARIABLES LIKE 'slow_query_log_use_global_control';
2243+SHOW GLOBAL VARIABLES LIKE 'slow_query_log_use_global_control';
2244diff -ruN a/mysql-test/suite/percona/r/min_examined_row_limit.result b/mysql-test/suite/percona/r/min_examined_row_limit.result
2245--- a/mysql-test/suite/percona/r/min_examined_row_limit.result 1970-01-01 03:00:00.000000000 +0300
2246+++ b/mysql-test/suite/percona/r/min_examined_row_limit.result 2011-07-11 05:59:04.264336032 +0300
2247@@ -0,0 +1,30 @@
2248+drop table if exists t;
2249+create table t(id INT PRIMARY KEY);
2250+insert into t values(1);
2251+insert into t values(2);
2252+insert into t values(3);
2253+SET GLOBAL debug="+d,query_exec_time_debug";
2254+SET GLOBAL long_query_time=2;
2255+SET GLOBAL slow_query_log_use_global_control='long_query_time,min_examined_row_limit';
2256+[log_start.inc] percona.slow_extended.min_examined_row_limit
2257+SET SESSION debug="+d,query_exec_time_2.1";
2258+SET GLOBAL min_examined_row_limit=5;
2259+/* query_exec_time= "2.1" */ select * from t as t1, t as t2;
2260+id id
2261+1 1
2262+2 1
2263+3 1
2264+1 2
2265+2 2
2266+3 2
2267+1 3
2268+2 3
2269+3 3
2270+SET SESSION debug="+d,query_exec_time_2.1";
2271+[log_stop.inc] percona.slow_extended.min_examined_row_limit
2272+SET GLOBAL min_examined_row_limit=default;
2273+SET GLOBAL slow_query_log_use_global_control=default;
2274+SET GLOBAL long_query_time=default;
2275+SET GLOBAL debug=default;
2276+[log_grep.inc] file: percona.slow_extended.min_examined_row_limit pattern: Query_time
2277+[log_grep.inc] lines: 1
2278diff -ruN a/mysql-test/suite/percona/t/min_examined_row_limit.test b/mysql-test/suite/percona/t/min_examined_row_limit.test
2279--- a/mysql-test/suite/percona/t/min_examined_row_limit.test 1970-01-01 03:00:00.000000000 +0300
2280+++ b/mysql-test/suite/percona/t/min_examined_row_limit.test 2011-07-11 05:58:32.451111623 +0300
2281@@ -0,0 +1,34 @@
2282+--source include/have_debug.inc
2283+
2284+--disable_warnings
2285+drop table if exists t;
2286+--enable_warnings
2287+
2288+create table t(id INT PRIMARY KEY);
2289+insert into t values(1);
2290+insert into t values(2);
2291+insert into t values(3);
2292+
2293+SET GLOBAL debug="+d,query_exec_time_debug";
2294+SET GLOBAL long_query_time=2;
2295+SET GLOBAL slow_query_log_use_global_control='long_query_time,min_examined_row_limit';
2296+--let log_file=percona.slow_extended.min_examined_row_limit
2297+--source suite/percona/include/log_start.inc
2298+
2299+SET SESSION debug="+d,query_exec_time_2.1";
2300+
2301+SET GLOBAL min_examined_row_limit=5;
2302+
2303+/* query_exec_time= "2.1" */ select * from t as t1, t as t2;
2304+SET SESSION debug="+d,query_exec_time_2.1";
2305+
2306+--source suite/percona/include/log_stop.inc
2307+SET GLOBAL min_examined_row_limit=default;
2308+SET GLOBAL slow_query_log_use_global_control=default;
2309+SET GLOBAL long_query_time=default;
2310+SET GLOBAL debug=default;
2311+
2312+--let grep_pattern = Query_time
2313+--source suite/percona/include/log_grep.inc
2314+
2315+DROP TABLE t;

Subscribers

People subscribed via source and target branches