Merge lp:~percona-dev/percona-server/release-5.1.53-bug693818 into lp:~percona-dev/percona-server/release-5.1.53

[Alexey Kopytov]

[Vadim Tkachenko (vadim-tk)]

please propose the merge to lp:percona-server ( 5.1.54) also

review: Needs Fixing

[Oleg Tsarev (tsarev)]

Vadim,

Already proposed, approved, and merged
http://bazaar.launchpad.net/~percona-dev/percona-server/5.1.54/revision/182

[Vadim Tkachenko (vadim-tk)]

review: Approve

=== added file 'mysql-test/slow_extended.patch/grep.inc'
--- mysql-test/slow_extended.patch/grep.inc	1970-01-01 00:00:00 +0000
+++ mysql-test/slow_extended.patch/grep.inc	2010-12-28 22:47:52 +0000
@@ -0,0 +1,16 @@
+perl;
+
+  $file = $ENV{'grep_file'};
+  $pattern = $ENV{'grep_pattern'};
+
+  open(FILE, "$file")
+    or die("Cannot open file $file: $!\n");
+
+  $lines = 0;
+  while(<FILE>) {
+    $lines++ if (/$pattern/);
+  }
+  print "$lines\n";
+
+  close(FILE);
+EOF

=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-control_global_slow.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-control_global_slow.test	2010-12-06 03:50:48 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-control_global_slow.test	2010-12-28 22:47:52 +0000
@@ -5,5 +5,8 @@
 SELECT sleep(2);
 set global use_global_log_slow_control=none;
 set global log_slow_verbosity=microtime;
-let $cmd = cat $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-control_global_slow.log | grep "No InnoDB statistics available for this query" | wc -l;
-exec $cmd;
+
+--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-control_global_slow.log
+--let grep_pattern = No InnoDB statistics available for this query
+
+--source include/grep.inc

=== modified 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	2010-12-06 03:50:48 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter.test	2010-12-28 22:47:52 +0000
@@ -26,5 +26,7 @@
 drop table if exists t;
 --enable_warnings
 
-let $cmd = cat $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-log_slow_filter.log | grep Query_time | wc -l;
-exec $cmd;
+--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-log_slow_filter.log
+--let grep_pattern = Query_time
+
+--source include/grep.inc

=== modified 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	2010-12-06 03:50:48 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_verbosity.test	2010-12-28 22:47:52 +0000
@@ -6,5 +6,7 @@
 
 SELECT sleep(2);
 
-let $cmd = cat $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-log_slow_verbosity.log | grep "No InnoDB statistics available for this query" | wc -l;
-exec $cmd;
+--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-log_slow_verbosity.log
+--let grep_pattern = No InnoDB statistics available for this query
+
+--source include/grep.inc

=== modified 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	2010-12-06 03:50:48 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-long_query_time.test	2010-12-28 22:47:52 +0000
@@ -12,5 +12,7 @@
 
 set long_query_time=2;
 
-let $cmd = cat $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-long_query_time.log | grep Query_time | wc -l;
-exec $cmd;
+--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-long_query_time.log
+--let grep_pattern = Query_time
+--source include/grep.inc
+

=== modified 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	2010-12-06 03:50:48 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.test	2010-12-28 22:47:52 +0000
@@ -8,8 +8,11 @@
 
 set global slow_query_log_microseconds_timestamp=OFF;
 
-let $cmd = cat $MYSQLTEST_VARDIR/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;
-exec $cmd;
-
-let $cmd = cat $MYSQLTEST_VARDIR/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;
-exec $cmd;
+--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-microseconds_in_slow_query_log.log
+--let grep_pattern = # Time: [0-9]+[ ]+[0-9]+:[0-9]+:[0-9]+.[0-9]+
+--source include/grep.inc
+
+--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-microseconds_in_slow_query_log.log 
+--let grep_pattern =  # Time: [0-9]+[ ]+[0-9]+:[0-9]+:[0-9]+
+--source include/grep.inc
+

=== modified 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	2010-12-06 03:50:48 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit.test	2010-12-28 22:47:52 +0000
@@ -26,5 +26,7 @@
 drop table if exists t;
 --enable_warnings
 
-let $cmd = cat $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-min_examined_row_limit.log | grep Query_time | wc -l;
-exec $cmd;
+--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-min_examined_row_limit.log
+--let grep_pattern = Query_time
+--source include/grep.inc
+

=== modified 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	2010-12-06 03:50:48 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.test	2010-12-28 22:47:52 +0000
@@ -41,4 +41,6 @@
 DROP TABLE IF EXISTS t;
 sync_slave_with_master;
 
-exec cat $MYSQLTEST_VARDIR/mysqld.2/mysqld-slow.log | grep InnoDB_IO_r_ops | wc -l;
+--let grep_file = $MYSQLTEST_VARDIR/mysqld.2/mysqld-slow.log
+--let grep_pattern =  InnoDB_IO_r_ops
+--source include/grep.inc

=== modified 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	2010-11-18 11:47:03 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.test	2010-12-28 22:47:52 +0000
@@ -78,11 +78,11 @@
 -- echo # Analyse master slow_query_log
 let $i=5;
 let $k=1;
-let $cmd=cat ./var/mysqld.1/data/percona_log_slow_slave_statements-master.log | grep;
 while($i)
 {
-    let $current_cmd = $cmd "INSERT INTO t VALUES ($k)" | wc -l;
-    exec $current_cmd;
+    --let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_log_slow_slave_statements-master.log
+    --let grep_pattern = INSERT INTO t VALUES \($k\)
+    --source include/grep.inc
     dec $i;
     inc $k;
 }
@@ -90,11 +90,11 @@
 -- echo # Analyse slave slow_query_log
 let $i=5;
 let $k=1;
-let $cmd=cat ./var/mysqld.2/data/percona_log_slow_slave_statements-slave.log | grep;
 while($i)
 {
-    let $current_cmd = $cmd "INSERT INTO t VALUES ($k)" | wc -l;
-    exec $current_cmd;
+    --let grep_file = $MYSQLTEST_VARDIR/mysqld.2/data/percona_log_slow_slave_statements-slave.log
+    --let grep_pattern = INSERT INTO t VALUES \($k\)
+    --source include/grep.inc
     dec $i;
     inc $k;
 }

=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_statements.test'
--- mysql-test/slow_extended.patch/percona_slow_extended-slave_statements.test	2010-11-18 12:19:15 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_statements.test	2010-12-28 22:47:52 +0000
@@ -125,11 +125,11 @@
 -- echo # Analyse master slow_query_log
 let $i=7;
 let $k=1;
-let $cmd=cat ./var/mysqld.1/data/percona_log_slow_slave_statements-master.log | grep;
 while($i)
 {
-    let $current_cmd = $cmd "INSERT INTO t VALUES ($k)" | wc -l;
-    exec $current_cmd;
+    --let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_log_slow_slave_statements-master.log
+    --let grep_pattern = INSERT INTO t VALUES \($k\)
+    --source include/grep.inc
     dec $i;
     inc $k;
 }
@@ -137,11 +137,11 @@
 -- echo # Analyse slave slow_query_log
 let $i=7;
 let $k=1;
-let $cmd=cat ./var/mysqld.2/data/percona_log_slow_slave_statements-slave.log | grep;
 while($i)
 {
-    let $current_cmd = $cmd "INSERT INTO t VALUES ($k)" | wc -l;
-    exec $current_cmd;
+    --let grep_file = $MYSQLTEST_VARDIR/mysqld.2/data/percona_log_slow_slave_statements-slave.log
+    --let grep_pattern = INSERT INTO t VALUES \($k\)
+    --source include/grep.inc
     dec $i;
     inc $k;
 }

=== modified 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	2010-12-06 03:50:48 +0000
+++ mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time.test	2010-12-28 22:47:52 +0000
@@ -14,8 +14,9 @@
 set global long_query_time=2;
 set global use_global_long_query_time=0;
 
-let $cmd = cat $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-use_global_long_query_time.log | grep Query_time | wc -l;
-exec $cmd;
+--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-use_global_long_query_time.log
+--let grep_pattern = Query_time
+--source include/grep.inc
 
 show global variables like 'use_global_log_slow_control';
 show global variables like 'use_global_long_query_time';

=== modified file 'slow_extended.patch'
--- slow_extended.patch	2010-11-26 11:54:21 +0000
+++ slow_extended.patch	2010-12-28 22:47:52 +0000
@@ -195,7 +195,7 @@
      }
      else
      {
-@@ -1010,8 +1026,20 @@
+@@ -1010,8 +1026,21 @@
        query_length= command_name[thd->command].length;
      }
  
@@ -203,6 +203,7 @@
 +    {
 +      thd->sent_row_count= thd->examined_row_count= 0;
 +      thd->row_count= 0;
++      thd->orig_row_count= 0;
 +      thd->bytes_sent_old= thd->status_var.bytes_sent;
 +      thd->tmp_tables_used= thd->tmp_tables_disk_used= 0;
 +      thd->tmp_tables_size= 0;
@@ -217,7 +218,7 @@
                                              user_host_buff, user_host_len,
                                              query_utime, lock_utime, is_command,
                                              query, query_length) || error;
-@@ -2280,12 +2308,13 @@
+@@ -2280,12 +2309,13 @@
      TRUE - error occured
  */
  
@@ -232,7 +233,7 @@
    bool error= 0;
    DBUG_ENTER("MYSQL_QUERY_LOG::write");
  
-@@ -2307,17 +2336,28 @@
+@@ -2307,17 +2337,28 @@
  
      if (!(specialflag & SPECIAL_SHORT_LOG_FORMAT))
      {
@@ -268,7 +269,7 @@
  
          /* Note that my_b_write() assumes it knows the length for this */
          if (my_b_write(&log_file, (uchar*) buff, buff_len))
-@@ -2335,12 +2375,64 @@
+@@ -2335,12 +2376,64 @@
      sprintf(query_time_buff, "%.6f", ulonglong2double(query_utime)/1000000.0);
      sprintf(lock_time_buff,  "%.6f", ulonglong2double(lock_utime)/1000000.0);
      if (my_b_printf(&log_file,
@@ -284,7 +285,7 @@
 -                    (ulong) thd->examined_row_count) == (uint) -1)
 +                    (ulong) thd->examined_row_count,
 +                    ((long) thd->row_count_func > 0 ) ? (ulong) thd->row_count_func : 0,
-+                    (ulong) thd->row_count,
++                    thd->row_count - thd->orig_row_count + 1,
 +                    (ulong) (thd->status_var.bytes_sent - thd->bytes_sent_old),
 +                    (ulong) thd->tmp_tables_used,
 +                    (ulong) thd->tmp_tables_disk_used,
@@ -1079,7 +1080,7 @@
  class sys_var_thd_storage_engine :public sys_var_thd
  {
  protected:
-@@ -1466,3 +1540,10 @@
+@@ -1466,3 +1542,10 @@
  bool process_key_caches(process_key_cache_t func);
  void delete_elements(I_List<NAMED_LIST> *list,
  		     void (*free_element)(const char*, uchar*));
@@ -1287,6 +1288,18 @@
    /* <> 0 if we are inside of trigger or stored function. */
    uint in_sub_stmt;
    /* TRUE when the current top has SQL_LOG_BIN ON */
+@@ -1777,6 +1817,11 @@
+     create_sort_index(); may differ from examined_row_count.
+   */
+   ulong      row_count;
++  /*
++    Original row_count value at the start of query execution
++    (used by the slow_extended patch).
++  */
++  ulong      orig_row_count;
+   pthread_t  real_id;                           /* For debugging */
+   my_thread_id  thread_id;
+   uint	     tmp_table, global_read_lock;
 diff -ruN a/sql/sql_connect.cc b/sql/sql_connect.cc
 --- a/sql/sql_connect.cc	2010-08-04 02:24:34.000000000 +0900
 +++ b/sql/sql_connect.cc	2010-08-27 14:30:34.905058444 +0900
@@ -1362,16 +1375,17 @@
    /*
      Do not log administrative statements unless the appropriate option is
      set.
-@@ -2085,6 +2122,8 @@
+@@ -2085,6 +2122,9 @@
      context.resolve_in_table_list_only(select_lex->
                                         table_list.first);
  
-+  /* Reset the counter at all cases for the extended slow query log */
-+  thd->row_count= 1;
++  /* Save the original row_count value for extended stats in slow query log */
++  thd->orig_row_count= thd->row_count;
++
    /*
      Reset warning count for each query that uses tables
      A better approach would be to reset this for any commands
-@@ -5800,6 +5839,21 @@
+@@ -5800,6 +5840,21 @@
    thd->rand_used= 0;
    thd->sent_row_count= thd->examined_row_count= 0;