Merge branch '10.0' into 10.1

1 files changed, 5 insertions, 4 deletions

diff --git a/plugin/feedback/sender_thread.cc b/plugin/feedback/sender_thread.cc
index 732118f245e..bbf7f567811 100644
--- a/plugin/feedback/sender_thread.cc
+++ b/plugin/feedback/sender_thread.cc
@@ -26,9 +26,9 @@ static my_thread_id thd_thread_id; ///< its thread_id
 
 static size_t needed_size= 20480;
 
-static const time_t startup_interval= 60*5;     ///< in seconds (5 minutes)
-static const time_t first_interval= 60*60*24;   ///< in seconds (one day)
-static const time_t interval= 60*60*24*7;       ///< in seconds (one week)
+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)
 
 /**
   reads the rows from a table and puts them, concatenated, in a String
@@ -125,6 +125,7 @@ static int prepare_for_fill(TABLE_LIST *tables)
   if (!tables->table)
     return 1;
 
+  tables->select_lex= thd->lex->current_select;
   tables->table->pos_in_table_list= tables;
 
   return 0;
@@ -260,7 +261,7 @@ ret:
       the effect of the background thread on SHOW STATUS.
     */
     mysql_mutex_lock(&LOCK_thread_count);
-    bzero(&thd->status_var, sizeof(thd->status_var));
+    thd->set_status_var_init();
     thread_count--;
     thd->killed= KILL_CONNECTION;
     mysql_cond_broadcast(&COND_thread_count);