Merge lp:~akopytov/percona-server/bug719386-5.1 into lp:percona-server/5.1

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

http://jenkins.percona.com/job/percona-server-5.1-param/445/

[Sergei Glushchenko (sergei.glushchenko)]

Approve G2

review: Approve (g2)

[Stewart Smith (stewart)]

review: Approve

[Laurynas Biveinis (laurynas-biveinis)]

I think THD::get_time() method should be const, likewise the arg of THD::set_time().

review: Needs Fixing

[Alexey Kopytov (akopytov)]

I don't think it makes any practical difference.

review: Approve

[Laurynas Biveinis (laurynas-biveinis)]

> I don't think it makes any practical difference.

Not much of a practical difference, but it's a code quality thing, there is no reason not to add const if it can be added. Anyway, I trust your judgment.

=== modified file 'Percona-Server/sql/sp_head.cc'
--- Percona-Server/sql/sp_head.cc	2012-05-09 04:14:12 +0000
+++ Percona-Server/sql/sp_head.cc	2012-10-15 15:43:33 +0000
@@ -2898,6 +2898,8 @@
   char *query;
   uint32 query_length;
   int res;
+  QUERY_START_TIME_INFO time_info;
+
   DBUG_ENTER("sp_instr_stmt::execute");
   DBUG_PRINT("info", ("command: %d", m_lex_keeper.sql_command()));
 
@@ -2907,6 +2909,19 @@
   /* This s-p instr is profilable and will be captured. */
   thd->profiling.set_query_source(m_query.str, m_query.length);
 #endif
+
+  memset(&time_info, 0, sizeof(time_info));
+
+  if (thd->enable_slow_log)
+  {
+    /*
+      Save start time info for the CALL statement and overwrite it with the
+      current time for log_slow_statement() to log the individual query timing.
+    */
+    thd->get_time(&time_info);
+    thd->set_time();
+  }
+
   if (!(res= alloc_query(thd, m_query.str, m_query.length)) &&
       !(res=subst_spvars(thd, this, &m_query)))
   {
@@ -2939,6 +2954,11 @@
     if (!thd->is_error())
       thd->main_da.reset_diagnostics_area();
   }
+
+  /* Restore the original query start time */
+  if (thd->enable_slow_log)
+    thd->set_time(&time_info);
+
   DBUG_RETURN(res || thd->is_error());
 }
 
 
=== modified file 'Percona-Server/sql/sql_class.h'
--- Percona-Server/sql/sql_class.h	2012-08-20 03:14:02 +0000
+++ Percona-Server/sql/sql_class.h	2012-10-15 15:43:33 +0000
@@ -1329,6 +1329,11 @@
   Ha_data() :ha_ptr(NULL) {}
 };
 
+typedef struct
+{
+  time_t start_time;
+  ulonglong start_utime;
+} QUERY_START_TIME_INFO;
 
 /**
   @class THD
@@ -2217,6 +2222,16 @@
     start_time= user_time= t;
     start_utime= utime_after_lock= my_micro_time();
   }
+  void get_time(QUERY_START_TIME_INFO *time_info)
+  {
+    time_info->start_time= start_time;
+    time_info->start_utime= start_utime;
+  }
+  void set_time(QUERY_START_TIME_INFO *time_info)
+  {
+    start_time= time_info->start_time;
+    start_utime= time_info->start_utime;
+  }
   /*TODO: this will be obsolete when we have support for 64 bit my_time_t */
   inline bool	is_valid_time() 
   {