Merge branch '5.5' into 10.0

3 files changed, 8 insertions, 7 deletions

diff --git a/plugin/feedback/feedback.cc b/plugin/feedback/feedback.cc
index 1a2504c5f6f..de7b2c9060b 100644
--- a/plugin/feedback/feedback.cc
+++ b/plugin/feedback/feedback.cc
@@ -262,7 +262,7 @@ static int init(void *p)
     startup_interval= debug_startup_interval;
     first_interval= debug_first_interval;
     interval= debug_interval;
-    user_info= "mysql-test";
+    user_info= const_cast<char*>("mysql-test");
   }
 #endif
 
diff --git a/plugin/feedback/feedback.h b/plugin/feedback/feedback.h
index 52ab32dfb2b..2cfbeed4eb5 100644
--- a/plugin/feedback/feedback.h
+++ b/plugin/feedback/feedback.h
@@ -59,9 +59,9 @@ class Url {
 extern Url **urls;
 extern uint url_count;
 
-extern time_t startup_interval;
-extern time_t first_interval;
-extern time_t interval;
+extern ulong startup_interval;
+extern ulong first_interval;
+extern ulong interval;
 
 /* these are used to communicate with the background thread */
 extern mysql_mutex_t sleep_mutex;
diff --git a/plugin/feedback/sender_thread.cc b/plugin/feedback/sender_thread.cc
index 5114fd48726..9417dc85b7d 100644
--- a/plugin/feedback/sender_thread.cc
+++ b/plugin/feedback/sender_thread.cc
@@ -25,9 +25,9 @@ static my_thread_id thd_thread_id; ///< its thread_id
 
 static size_t needed_size= 20480;
 
-time_t startup_interval= 60*5;     ///< in seconds (5 minutes)
-time_t first_interval= 60*60*24;   ///< in seconds (one day)
-time_t interval= 60*60*24*7;       ///< in seconds (one week)
+ulong startup_interval= 60*5;     ///< in seconds (5 minutes)
+ulong first_interval= 60*60*24;   ///< in seconds (one day)
+ulong interval= 60*60*24*7;       ///< in seconds (one week)
 
 /**
   reads the rows from a table and puts them, concatenated, in a String
@@ -254,6 +254,7 @@ ret:
   {
     if (tables.table)
       free_tmp_table(thd, tables.table);
+    thd->cleanup_after_query();
     /*
       clean up, free the thd.
       reset all thread local status variables to minimize