Merge lp:~percona-dev/percona-server/release-5.1.46-11-test-global_long_query_time into lp:percona-server/release-5.1.47-11

[Oleg Tsarev]

Add test for use_global_long_query_time

[Vadim Tkachenko (vadim-tk)]

review: Approve

=== added file 'mysql-test/percona_slow_query_log-long_query_time-master.opt'
--- mysql-test/percona_slow_query_log-long_query_time-master.opt	1970-01-01 00:00:00 +0000
+++ mysql-test/percona_slow_query_log-long_query_time-master.opt	2010-05-27 17:47:58 +0000
@@ -0,0 +1,1 @@
+--slow-query-log-file=percona_slow_query_log.log --long-query-time=2
 \ No newline at end of file
 
=== added file 'mysql-test/percona_slow_query_log-long_query_time.result'
--- mysql-test/percona_slow_query_log-long_query_time.result	1970-01-01 00:00:00 +0000
+++ mysql-test/percona_slow_query_log-long_query_time.result	2010-05-27 17:47:58 +0000
@@ -0,0 +1,24 @@
+SELECT sleep(1);
+sleep(1)
+0
+SELECT sleep(3);
+sleep(3)
+0
+SELECT sleep(5);
+sleep(5)
+0
+set global long_query_time=4;
+set global use_global_long_query_time=1;
+SELECT sleep(1);
+sleep(1)
+0
+SELECT sleep(3);
+sleep(3)
+0
+SELECT sleep(5);
+sleep(5)
+0
+set global long_query_time=2;
+set global use_global_long_query_time=0;
+cat var/mysqld.1/data/percona_slow_query_log.log | grep Query_time | wc -l
+3
 
=== added file 'mysql-test/percona_slow_query_log-long_query_time.test'
--- mysql-test/percona_slow_query_log-long_query_time.test	1970-01-01 00:00:00 +0000
+++ mysql-test/percona_slow_query_log-long_query_time.test	2010-05-27 17:47:58 +0000
@@ -0,0 +1,19 @@
+source include/have_innodb.inc;
+
+SELECT sleep(1);
+SELECT sleep(3);
+SELECT sleep(5);
+
+set global long_query_time=4;
+set global use_global_long_query_time=1;
+
+SELECT sleep(1);
+SELECT sleep(3);
+SELECT sleep(5);
+
+set global long_query_time=2;
+set global use_global_long_query_time=0;
+
+let $cmd = cat var/mysqld.1/data/percona_slow_query_log.log | grep Query_time | wc -l;
+echo $cmd;
+exec $cmd;