7 files changed, 20 insertions, 7 deletions
diff --git a/sql/event_db_repository.cc b/sql/event_db_repository.cc
index b7e82d8b4b9..edd4e248038 100644
--- a/sql/event_db_repository.cc
+++ b/sql/event_db_repository.cc
@@ -163,7 +163,7 @@ const TABLE_FIELD_TYPE event_table_fields[ET_FIELD_COUNT] =
 };
 
 static const TABLE_FIELD_DEF
-  event_table_def= {ET_FIELD_COUNT, event_table_fields};
+event_table_def= {ET_FIELD_COUNT, event_table_fields, 0, (uint*) 0};
 
 class Event_db_intact : public Table_check_intact
 {
diff --git a/sql/keycaches.cc b/sql/keycaches.cc
index 9e4b943dc83..120aa7e1029 100644
--- a/sql/keycaches.cc
+++ b/sql/keycaches.cc
@@ -225,3 +225,7 @@ void free_rpl_filter(const char *name, Rpl_filter *filter)
   delete filter;
 }
 
+void free_all_rpl_filters()
+{
+  rpl_filters.delete_elements((void (*)(const char*, uchar*)) free_rpl_filter);
+}
diff --git a/sql/keycaches.h b/sql/keycaches.h
index 2d52cb28973..32537339e2e 100644
--- a/sql/keycaches.h
+++ b/sql/keycaches.h
@@ -53,5 +53,6 @@ Rpl_filter *create_rpl_filter(const char *name, uint length);
 Rpl_filter *get_rpl_filter(LEX_STRING *filter_name);
 Rpl_filter *get_or_create_rpl_filter(const char *name, uint length);
 void free_rpl_filter(const char *name, Rpl_filter *filter);
+void free_all_rpl_filters(void);
 
 #endif /* KEYCACHES_INCLUDED */
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc
index 11c6e54c8f8..7733354b106 100644
--- a/sql/rpl_rli.cc
+++ b/sql/rpl_rli.cc
@@ -48,7 +48,8 @@ Relay_log_info::Relay_log_info(bool is_slave_recovery)
    no_storage(FALSE), replicate_same_server_id(::replicate_same_server_id),
    info_fd(-1), cur_log_fd(-1), relay_log(&sync_relaylog_period),
    sync_counter(0), is_relay_log_recovery(is_slave_recovery),
-   save_temporary_tables(0), cur_log_old_open_count(0), group_relay_log_pos(0), 
+   save_temporary_tables(0), mi(0),
+   cur_log_old_open_count(0), group_relay_log_pos(0), 
    event_relay_log_pos(0),
 #if HAVE_valgrind
    is_fake(FALSE),
@@ -61,7 +62,7 @@ Relay_log_info::Relay_log_info(bool is_slave_recovery)
    gtid_sub_id(0), tables_to_lock(0), tables_to_lock_count(0),
    last_event_start_time(0), deferred_events(NULL),m_flags(0),
    row_stmt_start_timestamp(0), long_find_row_note_printed(false),
-   m_annotate_event(0), mi(0)
+   m_annotate_event(0)
 {
   DBUG_ENTER("Relay_log_info::Relay_log_info");
 
diff --git a/sql/slave.cc b/sql/slave.cc
index 2e436d5e8b4..36d26e76dce 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -870,6 +870,7 @@ void end_slave()
   master_info_index= 0;
   active_mi= 0;
   mysql_mutex_unlock(&LOCK_active_mi);
+  free_all_rpl_filters();
   DBUG_VOID_RETURN;
 }
 
@@ -5003,6 +5004,7 @@ static int connect_to_master(THD* thd, MYSQL* mysql, Master_info* mi,
   int last_errno= -2;                           // impossible error
   ulong err_count=0;
   char llbuff[22];
+  my_bool my_true= 1;
   DBUG_ENTER("connect_to_master");
 
 #ifndef DBUG_OFF
@@ -5014,6 +5016,8 @@ static int connect_to_master(THD* thd, MYSQL* mysql, Master_info* mi,
 
   mysql_options(mysql, MYSQL_OPT_CONNECT_TIMEOUT, (char *) &slave_net_timeout);
   mysql_options(mysql, MYSQL_OPT_READ_TIMEOUT, (char *) &slave_net_timeout);
+  mysql_options(mysql, MYSQL_OPT_USE_THREAD_SPECIFIC_MEMORY,
+                (char*) &my_true);
 
 #ifdef HAVE_OPENSSL
   if (mi->ssl)
@@ -5129,14 +5133,15 @@ MYSQL *rpl_connect_master(MYSQL *mysql)
 {
   THD *thd= current_thd;
   Master_info *mi= my_pthread_getspecific_ptr(Master_info*, RPL_MASTER_INFO);
+  bool allocated= false;
+  my_bool my_true= 1;
+
   if (!mi)
   {
     sql_print_error("'rpl_connect_master' must be called in slave I/O thread context.");
     return NULL;
   }
 
-  bool allocated= false;
-  
   if (!mysql)
   {
     if(!(mysql= mysql_init(NULL)))
@@ -5156,6 +5161,8 @@ MYSQL *rpl_connect_master(MYSQL *mysql)
   */
   mysql_options(mysql, MYSQL_OPT_CONNECT_TIMEOUT, (char *) &slave_net_timeout);
   mysql_options(mysql, MYSQL_OPT_READ_TIMEOUT, (char *) &slave_net_timeout);
+  mysql_options(mysql, MYSQL_OPT_USE_THREAD_SPECIFIC_MEMORY,
+                (char*) &my_true);
 
 #ifdef HAVE_OPENSSL
   if (mi->ssl)
diff --git a/sql/sp.cc b/sql/sp.cc
index b80fa968483..2aec9d19869 100644
--- a/sql/sp.cc
+++ b/sql/sp.cc
@@ -168,7 +168,7 @@ TABLE_FIELD_TYPE proc_table_fields[MYSQL_PROC_FIELD_COUNT] =
 };
 
 static const TABLE_FIELD_DEF
-  proc_table_def= {MYSQL_PROC_FIELD_COUNT, proc_table_fields};
+proc_table_def= {MYSQL_PROC_FIELD_COUNT, proc_table_fields, 0, (uint*) 0 };
 
 /*************************************************************************/
 
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 7810bdb16e2..69290a64a29 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -171,7 +171,7 @@ TABLE_FIELD_TYPE mysql_db_table_fields[MYSQL_DB_FIELD_COUNT] = {
 };
 
 const TABLE_FIELD_DEF
-  mysql_db_table_def= {MYSQL_DB_FIELD_COUNT, mysql_db_table_fields};
+mysql_db_table_def= {MYSQL_DB_FIELD_COUNT, mysql_db_table_fields, 0, (uint*) 0 };
 
 static LEX_STRING native_password_plugin_name= {
   C_STRING_WITH_LEN("mysql_native_password")