Merge lp:~tsarev/percona-server/release-5.1.57-12.8-794774 into lp:~percona-dev/percona-server/5.5.11

[Oleg Tsarev]

The reason of bug #794774: patch profiling_slow.patch adds option "log_slow_verbosity" with value "profiling_use_getrusage".
This option enable/disable call "getrusage", but doesn't check status when uses variable changed by "getrusage".
As result valgrind show warning "potential use of uninitialized value".
Now I check status before access to changed variables.
This is actual for tests:
 * main.profiling
 * main.show_profile

[Stewart Smith (stewart)]

looks like wrong branch proposed. please resubmit against main lp:percona-server and/or lp:percona-server/5.1

review: Needs Fixing

=== modified file 'profiling_slow.patch'
--- profiling_slow.patch	2011-06-09 00:04:54 +0000
+++ profiling_slow.patch	2011-06-09 00:04:57 +0000
@@ -327,6 +327,23 @@
  /**
    Fill the information schema table, "query_profile", as defined in show.cc .
    There are two ways to get to this function:  Selecting from the information
+@@ -575,6 +702,8 @@
+ 
+ #ifdef HAVE_GETRUSAGE
+ 
++      if (enabled_getrusage())
++      {
+       my_decimal cpu_utime_decimal, cpu_stime_decimal;
+ 
+       double2my_decimal(E_DEC_FATAL_ERROR,
+@@ -645,6 +774,7 @@
+       table->field[14]->store((uint32)(entry->rusage.ru_nswap -
+                              previous->rusage.ru_nswap), true);
+       table->field[14]->set_notnull();
++      }
+ #else
+       /* TODO: Add swap info for non-BSD systems */
+ #endif
 diff -ruN a/sql/sql_profile.h b/sql/sql_profile.h
 --- a/sql/sql_profile.h	2010-10-12 00:34:33.000000000 +0400
 +++ b/sql/sql_profile.h	2010-11-25 15:54:48.000000000 +0300