Merge lp:~percona-dev/percona-server/release-5.1.47-11-microseconds_in_slow_query_log into lp:percona-server/release-5.1.47-11

[Oleg Tsarev]

support feature "microseconds_in_slow_query_log"
https://blueprints.launchpad.net/percona-server/+spec/microseconds-in-query-log

[Yasufumi Kinoshita (yasufumi-kinoshita)]

Did you do most of mysql-test script already?

Or do you also request me to test your all changes? :-)

[Oleg Tsarev (tsarev)]

No, this feature is work, and test a run by me.
All out trouble from bug https://bugs.launchpad.net/percona-server/+bug/587832

[Yasufumi Kinoshita (yasufumi-kinoshita)]

Though it seems to have bugs. But the patch make bus smaller... Approve for now...

review: Approve

[Yasufumi Kinoshita (yasufumi-kinoshita)]

Again+

review: Approve

=== modified file 'control-global-slow.patch'
--- control-global-slow.patch	2010-05-27 23:11:03 +0000
+++ control-global-slow.patch	2010-06-01 10:45:41 +0000
@@ -137,8 +137,8 @@
  }
 -
 +#define SLOG_UG_SETUP(session,value,flag,global) do {   \
-+  if(value & flag == flag)                            \
-+    session = global;                                 \
++  if(value & flag) \
++    session = global; \
 +  } while(false);
  
  void log_slow_statement(THD *thd)

=== added file 'microseconds_in_slow_query_log.patch'
--- microseconds_in_slow_query_log.patch	1970-01-01 00:00:00 +0000
+++ microseconds_in_slow_query_log.patch	2010-06-01 10:45:41 +0000
@@ -0,0 +1,182 @@
+diff -Nur a/sql/log.cc b/sql/log.cc
+--- a/sql/log.cc	2010-05-31 20:12:17.000000000 +0400
++++ b/sql/log.cc	2010-05-31 20:13:05.000000000 +0400
+@@ -524,11 +524,13 @@
+ */
+ 
+ bool Log_to_csv_event_handler::
+-  log_slow(THD *thd, time_t current_time, time_t query_start_arg,
++  log_slow(THD *thd, ulonglong current_utime, time_t query_start_arg,
+            const char *user_host, uint user_host_len,
+            ulonglong query_utime, ulonglong lock_utime, bool is_command,
+            const char *sql_text, uint sql_text_len)
+ {
++  time_t current_time= my_time_possible_from_micro(current_utime);
++
+   TABLE_LIST table_list;
+   TABLE *table;
+   bool result= TRUE;
+@@ -754,14 +756,14 @@
+ /** Wrapper around MYSQL_LOG::write() for slow log. */
+ 
+ bool Log_to_file_event_handler::
+-  log_slow(THD *thd, time_t current_time, time_t query_start_arg,
++  log_slow(THD *thd, ulonglong current_utime, time_t query_start_arg,
+            const char *user_host, uint user_host_len,
+            ulonglong query_utime, ulonglong lock_utime, bool is_command,
+            const char *sql_text, uint sql_text_len)
+ {
+   Silence_log_table_errors error_handler;
+   thd->push_internal_handler(&error_handler);
+-  bool retval= mysql_slow_log.write(thd, current_time, query_start_arg,
++  bool retval= mysql_slow_log.write(thd, current_utime, query_start_arg,
+                                     user_host, user_host_len,
+                                     query_utime, lock_utime, is_command,
+                                     sql_text, sql_text_len);
+@@ -1045,7 +1047,7 @@
+     }
+ 
+     for (current_handler= slow_log_handler_list; *current_handler ;)
+-      error= (*current_handler++)->log_slow(thd, current_time, thd->start_time,
++      error= (*current_handler++)->log_slow(thd, current_utime, thd->start_time,
+                                             user_host_buff, user_host_len,
+                                             query_utime, lock_utime, is_command,
+                                             query, query_length) || error;
+@@ -2314,12 +2316,13 @@
+     TRUE - error occured
+ */
+ 
+-bool MYSQL_QUERY_LOG::write(THD *thd, time_t current_time,
++bool MYSQL_QUERY_LOG::write(THD *thd, ulonglong current_utime,
+                             time_t query_start_arg, const char *user_host,
+                             uint user_host_len, ulonglong query_utime,
+                             ulonglong lock_utime, bool is_command,
+                             const char *sql_text, uint sql_text_len)
+ {
++  time_t current_time= my_time_possible_from_micro(current_utime);
+   bool error= 0;
+   DBUG_ENTER("MYSQL_QUERY_LOG::write");
+ 
+@@ -2346,12 +2349,23 @@
+         last_time= current_time;
+         struct tm start;
+         localtime_r(&current_time, &start);
+-
+-        buff_len= my_snprintf(buff, sizeof buff,
+-                              "# Time: %02d%02d%02d %2d:%02d:%02d\n",
+-                              start.tm_year % 100, start.tm_mon + 1,
+-                              start.tm_mday, start.tm_hour,
+-                              start.tm_min, start.tm_sec);
++	if(opt_microseconds_in_slow_query_log)
++	{
++	  ulonglong microsecond = current_utime % (1000 * 1000);
++	  buff_len= snprintf(buff, sizeof buff,
++	    "# Time: %02d%02d%02d %2d:%02d:%02d.%010lld\n",
++            start.tm_year % 100, start.tm_mon + 1,
++	    start.tm_mday, start.tm_hour,
++	    start.tm_min, start.tm_sec,microsecond);
++	}
++	else
++	{
++	  buff_len= my_snprintf(buff, sizeof buff,
++	    "# Time: %02d%02d%02d %2d:%02d:%02d\n",
++            start.tm_year % 100, start.tm_mon + 1,
++	    start.tm_mday, start.tm_hour,
++	    start.tm_min, start.tm_sec);
++	}
+ 
+         /* Note that my_b_write() assumes it knows the length for this */
+         if (my_b_write(&log_file, (uchar*) buff, buff_len))
+diff -Nur a/sql/log.h b/sql/log.h
+--- a/sql/log.h	2010-05-31 20:12:22.000000000 +0400
++++ b/sql/log.h	2010-05-31 20:13:07.000000000 +0400
+@@ -206,7 +206,7 @@
+              uint user_host_len, int thread_id,
+              const char *command_type, uint command_type_len,
+              const char *sql_text, uint sql_text_len);
+-  bool write(THD *thd, time_t current_time, time_t query_start_arg,
++  bool write(THD *thd, ulonglong current_utime, time_t query_start_arg,
+              const char *user_host, uint user_host_len,
+              ulonglong query_utime, ulonglong lock_utime, bool is_command,
+              const char *sql_text, uint sql_text_len);
+@@ -429,7 +429,7 @@
+   virtual bool init()= 0;
+   virtual void cleanup()= 0;
+ 
+-  virtual bool log_slow(THD *thd, time_t current_time,
++  virtual bool log_slow(THD *thd, ulonglong current_utime,
+                         time_t query_start_arg, const char *user_host,
+                         uint user_host_len, ulonglong query_utime,
+                         ulonglong lock_utime, bool is_command,
+@@ -458,7 +458,7 @@
+   virtual bool init();
+   virtual void cleanup();
+ 
+-  virtual bool log_slow(THD *thd, time_t current_time,
++  virtual bool log_slow(THD *thd, ulonglong current_utime,
+                         time_t query_start_arg, const char *user_host,
+                         uint user_host_len, ulonglong query_utime,
+                         ulonglong lock_utime, bool is_command,
+@@ -490,7 +490,7 @@
+   virtual bool init();
+   virtual void cleanup();
+ 
+-  virtual bool log_slow(THD *thd, time_t current_time,
++  virtual bool log_slow(THD *thd, ulonglong current_utime,
+                         time_t query_start_arg, const char *user_host,
+                         uint user_host_len, ulonglong query_utime,
+                         ulonglong lock_utime, bool is_command,
+Двоичные файлы a/sql/log.o и b/sql/log.o различаются
+diff -Nur a/sql/mysqld.cc b/sql/mysqld.cc
+--- a/sql/mysqld.cc	2010-05-31 20:12:40.000000000 +0400
++++ b/sql/mysqld.cc	2010-05-31 20:13:27.000000000 +0400
+@@ -487,6 +487,7 @@
+ my_bool opt_log_slow_sp_statements= 0;
+ my_bool opt_log_slow_timestamp_every= 0;
+ my_bool opt_use_global_long_query_time= 0;
++my_bool opt_microseconds_in_slow_query_log= 0;
+ my_bool lower_case_file_system= 0;
+ my_bool opt_large_pages= 0;
+ my_bool opt_myisam_use_mmap= 0;
+@@ -5786,6 +5787,7 @@
+   OPT_SUPPRESS_LOG_WARNING_1592,
+   OPT_USE_GLOBAL_LONG_QUERY_TIME,
+   OPT_USE_GLOBAL_LOG_SLOW_CONTROL,
++  OPT_MICROSECONDS_IN_SLOW_QUERY_LOG,
+   OPT_IGNORE_BUILTIN_INNODB,
+   OPT_BINLOG_DIRECT_NON_TRANS_UPDATE,
+   OPT_DEFAULT_CHARACTER_SET_OLD
+@@ -6798,6 +6800,10 @@
+    "Control always use global long_query_time or local long_query_time.",
+    (uchar**) &opt_use_global_long_query_time, (uchar**) &opt_use_global_long_query_time,
+    0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 1, 0},
++  {"microseconds_in_slow_query_log", OPT_MICROSECONDS_IN_SLOW_QUERY_LOG,
++   "Use microsecond time's precision in slow query log",
++   (uchar**) &opt_microseconds_in_slow_query_log, (uchar**) &opt_microseconds_in_slow_query_log,
++   0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 1, 0},
+   {"lower_case_table_names", OPT_LOWER_CASE_TABLE_NAMES,
+    "If set to 1, table names are stored in lowercase on disk and table names "
+    "will be case-insensitive.  Should be set to 2 if you are using a case-"
+diff -Nur a/sql/mysql_priv.h b/sql/mysql_priv.h
+--- a/sql/mysql_priv.h	2010-05-31 20:12:45.000000000 +0400
++++ b/sql/mysql_priv.h	2010-05-31 20:13:19.000000000 +0400
+@@ -2124,6 +2124,7 @@
+ extern my_bool opt_log_slow_sp_statements;
+ extern my_bool opt_log_slow_timestamp_every;
+ extern my_bool opt_use_global_long_query_time;
++extern my_bool opt_microseconds_in_slow_query_log;
+ extern my_bool sp_automatic_privileges, opt_noacl;
+ extern my_bool opt_old_style_user_limits, trust_function_creators;
+ extern uint opt_crash_binlog_innodb;
+diff -Nur a/sql/set_var.cc b/sql/set_var.cc
+--- a/sql/set_var.cc	2010-05-31 20:12:27.000000000 +0400
++++ b/sql/set_var.cc	2010-05-31 20:13:14.000000000 +0400
+@@ -932,6 +932,8 @@
+                                                            &opt_log_slow_timestamp_every);
+ static sys_var_bool_ptr       sys_use_global_long_query_time(&vars, "use_global_long_query_time",
+                                                        &opt_use_global_long_query_time);
++static sys_var_bool_ptr       sys_microseconds_in_slow_query_log(&vars, "microseconds_in_slow_query_log",
++                                                       &opt_microseconds_in_slow_query_log);
+ /* Synonym of "slow_query_log" for consistency with SHOW VARIABLES output */
+ static sys_var_log_state sys_var_log_slow(&vars, "log_slow_queries",
+                                           &opt_slow_log, QUERY_LOG_SLOW);

=== modified file 'mysql-test/percona_slow_query_log-control_global_slow-master.opt'
--- mysql-test/percona_slow_query_log-control_global_slow-master.opt	2010-05-27 23:14:07 +0000
+++ mysql-test/percona_slow_query_log-control_global_slow-master.opt	2010-06-01 10:45:41 +0000
@@ -1,1 +1,1 @@
---slow-query-log-file=percona_slow_query_log.log --long-query-time=1
\ No newline at end of file
+--slow-query-log-file=percona_slow_query_log-control_global_slow.log --long-query-time=1
\ No newline at end of file

=== modified file 'mysql-test/percona_slow_query_log-control_global_slow.result'
--- mysql-test/percona_slow_query_log-control_global_slow.result	2010-05-27 23:14:07 +0000
+++ mysql-test/percona_slow_query_log-control_global_slow.result	2010-06-01 10:45:41 +0000
@@ -8,5 +8,5 @@
 0
 set global use_global_log_slow_control=none;
 set global log_slow_verbosity=microtime;
-cat var/mysqld.1/data/percona_slow_query_log.log | grep "No InnoDB statistics available for this query" | wc -l
+cat var/mysqld.1/data/percona_slow_query_log-control_global_slow.log | grep "No InnoDB statistics available for this query" | wc -l
 1

=== modified file 'mysql-test/percona_slow_query_log-control_global_slow.test'
--- mysql-test/percona_slow_query_log-control_global_slow.test	2010-05-27 23:14:07 +0000
+++ mysql-test/percona_slow_query_log-control_global_slow.test	2010-06-01 10:45:41 +0000
@@ -5,6 +5,6 @@
 SELECT sleep(2);
 set global use_global_log_slow_control=none;
 set global log_slow_verbosity=microtime;
-let $cmd = cat var/mysqld.1/data/percona_slow_query_log.log | grep "No InnoDB statistics available for this query" | wc -l;
+let $cmd = cat var/mysqld.1/data/percona_slow_query_log-control_global_slow.log | grep "No InnoDB statistics available for this query" | wc -l;
 echo $cmd;
 exec $cmd;

=== modified file 'mysql-test/percona_slow_query_log-log_slow_filter-master.opt'
--- mysql-test/percona_slow_query_log-log_slow_filter-master.opt	2010-05-28 14:19:13 +0000
+++ mysql-test/percona_slow_query_log-log_slow_filter-master.opt	2010-06-01 10:45:41 +0000
@@ -1,1 +1,1 @@
---slow-query-log-file=percona_slow_query_log.log --long-query-time=1
\ No newline at end of file
+--slow-query-log-file=percona_slow_query_log-log_slow_filter.log --long-query-time=1
\ No newline at end of file

=== modified file 'mysql-test/percona_slow_query_log-log_slow_filter.result'
--- mysql-test/percona_slow_query_log-log_slow_filter.result	2010-05-28 14:19:13 +0000
+++ mysql-test/percona_slow_query_log-log_slow_filter.result	2010-06-01 10:45:41 +0000
@@ -19,5 +19,5 @@
 sleep(2)
 0
 drop table if exists t;
-cat var/mysqld.1/data/percona_slow_query_log.log | grep Query_time | wc -l
+cat var/mysqld.1/data/percona_slow_query_log-log_slow_filter.log | grep Query_time | wc -l
 2

=== modified file 'mysql-test/percona_slow_query_log-log_slow_filter.test'
--- mysql-test/percona_slow_query_log-log_slow_filter.test	2010-05-28 14:19:13 +0000
+++ mysql-test/percona_slow_query_log-log_slow_filter.test	2010-06-01 10:45:41 +0000
@@ -22,6 +22,6 @@
 drop table if exists t;
 --enable_warnings
 
-let $cmd = cat var/mysqld.1/data/percona_slow_query_log.log | grep Query_time | wc -l;
+let $cmd = cat var/mysqld.1/data/percona_slow_query_log-log_slow_filter.log | grep Query_time | wc -l;
 echo $cmd;
 exec $cmd;

=== modified file 'mysql-test/percona_slow_query_log-log_slow_verbosity-master.opt'
--- mysql-test/percona_slow_query_log-log_slow_verbosity-master.opt	2010-05-28 14:19:13 +0000
+++ mysql-test/percona_slow_query_log-log_slow_verbosity-master.opt	2010-06-01 10:45:41 +0000
@@ -1,1 +1,1 @@
---slow-query-log-file=percona_slow_query_log.log --long-query-time=1
\ No newline at end of file
+--slow-query-log-file=percona_slow_query_log-log_slow_verbosity.log --long-query-time=1
\ No newline at end of file

=== modified file 'mysql-test/percona_slow_query_log-log_slow_verbosity.result'
--- mysql-test/percona_slow_query_log-log_slow_verbosity.result	2010-05-28 14:19:13 +0000
+++ mysql-test/percona_slow_query_log-log_slow_verbosity.result	2010-06-01 10:45:41 +0000
@@ -5,5 +5,5 @@
 SELECT sleep(2);
 sleep(2)
 0
-cat var/mysqld.1/data/percona_slow_query_log.log | grep InnoDB | wc -l
+cat var/mysqld.1/data/percona_slow_query_log-log_slow_verbosity.log | grep InnoDB | wc -l
 1

=== modified file 'mysql-test/percona_slow_query_log-log_slow_verbosity.test'
--- mysql-test/percona_slow_query_log-log_slow_verbosity.test	2010-05-28 14:19:13 +0000
+++ mysql-test/percona_slow_query_log-log_slow_verbosity.test	2010-06-01 10:45:41 +0000
@@ -6,6 +6,6 @@
 
 SELECT sleep(2);
 
-let $cmd = cat var/mysqld.1/data/percona_slow_query_log.log | grep InnoDB | wc -l;
+let $cmd = cat var/mysqld.1/data/percona_slow_query_log-log_slow_verbosity.log | grep InnoDB | wc -l;
 echo $cmd;
 exec $cmd;

=== modified file 'mysql-test/percona_slow_query_log-long_query_time-master.opt'
--- mysql-test/percona_slow_query_log-long_query_time-master.opt	2010-05-26 14:18:37 +0000
+++ mysql-test/percona_slow_query_log-long_query_time-master.opt	2010-06-01 10:45:41 +0000
@@ -1,1 +1,1 @@
---slow-query-log-file=percona_slow_query_log.log --long-query-time=2
\ No newline at end of file
+--slow-query-log-file=percona_slow_query_log-long_query_time.log --long-query-time=2
\ No newline at end of file

=== modified file 'mysql-test/percona_slow_query_log-long_query_time.result'
--- mysql-test/percona_slow_query_log-long_query_time.result	2010-05-28 14:19:13 +0000
+++ mysql-test/percona_slow_query_log-long_query_time.result	2010-06-01 10:45:41 +0000
@@ -18,5 +18,5 @@
 sleep(5)
 0
 set long_query_time=2;
-cat var/mysqld.1/data/percona_slow_query_log.log | grep Query_time | wc -l
+cat var/mysqld.1/data/percona_slow_query_log-long_query_time.log | grep Query_time | wc -l
 3

=== modified file 'mysql-test/percona_slow_query_log-long_query_time.test'
--- mysql-test/percona_slow_query_log-long_query_time.test	2010-05-28 14:19:13 +0000
+++ mysql-test/percona_slow_query_log-long_query_time.test	2010-06-01 10:45:41 +0000
@@ -12,6 +12,6 @@
 
 set long_query_time=2;
 
-let $cmd = cat var/mysqld.1/data/percona_slow_query_log.log | grep Query_time | wc -l;
+let $cmd = cat var/mysqld.1/data/percona_slow_query_log-long_query_time.log | grep Query_time | wc -l;
 echo $cmd;
 exec $cmd;

=== added file 'mysql-test/percona_slow_query_log-microseconds_in_slow_query_log-master.opt'
--- mysql-test/percona_slow_query_log-microseconds_in_slow_query_log-master.opt	1970-01-01 00:00:00 +0000
+++ mysql-test/percona_slow_query_log-microseconds_in_slow_query_log-master.opt	2010-06-01 10:45:41 +0000
@@ -0,0 +1,1 @@
+--slow-query-log-file=percona_slow_query_log-microseconds_in_slow_query_log.log --long-query-time=1
\ No newline at end of file

=== added file 'mysql-test/percona_slow_query_log-microseconds_in_slow_query_log.result'
--- mysql-test/percona_slow_query_log-microseconds_in_slow_query_log.result	1970-01-01 00:00:00 +0000
+++ mysql-test/percona_slow_query_log-microseconds_in_slow_query_log.result	2010-06-01 10:45:41 +0000
@@ -0,0 +1,12 @@
+SELECT sleep(2);
+sleep(2)
+0
+set global microseconds_in_slow_query_log=1;
+SELECT sleep(2);
+sleep(2)
+0
+set global microseconds_in_slow_query_log=0;
+cat var/mysqld.1/data/percona_slow_query_log-microseconds_in_slow_query_log.log | grep -E '# Time: [0-9]+ [0-9]+:[0-\9]+:[0-9]+.[0-9]+' | wc -l
+1
+cat var/mysqld.1/data/percona_slow_query_log-microseconds_in_slow_query_log.log | grep -E '# Time: [0-9]+ [0-9]+:[0-\9]+:[0-9]+' | wc -l
+2

=== added file 'mysql-test/percona_slow_query_log-microseconds_in_slow_query_log.test'
--- mysql-test/percona_slow_query_log-microseconds_in_slow_query_log.test	1970-01-01 00:00:00 +0000
+++ mysql-test/percona_slow_query_log-microseconds_in_slow_query_log.test	2010-06-01 10:45:41 +0000
@@ -0,0 +1,17 @@
+source include/have_innodb.inc;
+
+SELECT sleep(2);
+
+set global microseconds_in_slow_query_log=1;
+
+SELECT sleep(2);
+
+set global microseconds_in_slow_query_log=0;
+
+let $cmd = cat var/mysqld.1/data/percona_slow_query_log-microseconds_in_slow_query_log.log | grep -E '# Time: [0-9]+ [0-9]+:[0-\9]+:[0-9]+.[0-9]+' | wc -l;
+echo $cmd;
+exec $cmd;
+
+let $cmd = cat var/mysqld.1/data/percona_slow_query_log-microseconds_in_slow_query_log.log | grep -E '# Time: [0-9]+ [0-9]+:[0-\9]+:[0-9]+' | wc -l;
+echo $cmd;
+exec $cmd;

=== modified file 'mysql-test/percona_slow_query_log-min_examined_row_limit-master.opt'
--- mysql-test/percona_slow_query_log-min_examined_row_limit-master.opt	2010-05-28 14:19:13 +0000
+++ mysql-test/percona_slow_query_log-min_examined_row_limit-master.opt	2010-06-01 10:45:41 +0000
@@ -1,1 +1,1 @@
---slow-query-log-file=percona_slow_query_log.log --long-query-time=1
\ No newline at end of file
+--slow-query-log-file=percona_slow_query_log-min_examined_row_limit.log --long-query-time=1
\ No newline at end of file

=== modified file 'mysql-test/percona_slow_query_log-min_examined_row_limit.result'
--- mysql-test/percona_slow_query_log-min_examined_row_limit.result	2010-05-28 14:19:13 +0000
+++ mysql-test/percona_slow_query_log-min_examined_row_limit.result	2010-06-01 10:45:41 +0000
@@ -19,5 +19,5 @@
 sleep(2)
 0
 drop table if exists t;
-cat var/mysqld.1/data/percona_slow_query_log.log | grep Query_time | wc -l
+cat var/mysqld.1/data/percona_slow_query_log-min_examined_row_limit.log | grep Query_time | wc -l
 2

=== modified file 'mysql-test/percona_slow_query_log-min_examined_row_limit.test'
--- mysql-test/percona_slow_query_log-min_examined_row_limit.test	2010-05-28 14:19:13 +0000
+++ mysql-test/percona_slow_query_log-min_examined_row_limit.test	2010-06-01 10:45:41 +0000
@@ -22,6 +22,6 @@
 drop table if exists t;
 --enable_warnings
 
-let $cmd = cat var/mysqld.1/data/percona_slow_query_log.log | grep Query_time | wc -l;
+let $cmd = cat var/mysqld.1/data/percona_slow_query_log-min_examined_row_limit.log | grep Query_time | wc -l;
 echo $cmd;
 exec $cmd;

=== modified file 'mysql-test/percona_slow_query_log-use_global_long_query_time-master.opt'
--- mysql-test/percona_slow_query_log-use_global_long_query_time-master.opt	2010-05-28 14:19:13 +0000
+++ mysql-test/percona_slow_query_log-use_global_long_query_time-master.opt	2010-06-01 10:45:41 +0000
@@ -1,1 +1,1 @@
---slow-query-log-file=percona_slow_query_log.log --long-query-time=2
\ No newline at end of file
+--slow-query-log-file=percona_slow_query_log-use_global_long_query_time.log --long-query-time=2
\ No newline at end of file

=== modified file 'mysql-test/percona_slow_query_log-use_global_long_query_time.result'
--- mysql-test/percona_slow_query_log-use_global_long_query_time.result	2010-05-28 14:19:13 +0000
+++ mysql-test/percona_slow_query_log-use_global_long_query_time.result	2010-06-01 10:45:41 +0000
@@ -20,5 +20,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
+cat var/mysqld.1/data/percona_slow_query_log-use_global_long_query_time.log | grep Query_time | wc -l
 3

=== modified file 'mysql-test/percona_slow_query_log-use_global_long_query_time.test'
--- mysql-test/percona_slow_query_log-use_global_long_query_time.test	2010-05-28 14:19:13 +0000
+++ mysql-test/percona_slow_query_log-use_global_long_query_time.test	2010-06-01 10:45:41 +0000
@@ -14,6 +14,6 @@
 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;
+let $cmd = cat var/mysqld.1/data/percona_slow_query_log-use_global_long_query_time.log | grep Query_time | wc -l;
 echo $cmd;
 exec $cmd;

=== modified file 'series'
--- series	2010-05-27 23:11:03 +0000
+++ series	2010-06-01 10:45:41 +0000
@@ -38,4 +38,5 @@
 percona-support.patch
 innodb_deadlock_count.patch
 bug580324.patch
-control-global-slow.patch
\ No newline at end of file
+control-global-slow.patch
+microseconds_in_slow_query_log.patch
\ No newline at end of file