Fixed a valgrind problem.

The function setup_tables should handle table_list elements for
semijoin materialized tables in a special way when executing
a prepared statement for the second time.

1 files changed, 10 insertions, 3 deletions

diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index c42551100ae..57775146b90 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -7830,9 +7830,16 @@ bool setup_tables(THD *thd, Name_resolution_context *context,
     select_lex->leaf_tables.empty();
     while ((table_list= ti++))
     {
-      table_list->table->tablenr= table_list->tablenr_exec;
-      table_list->table->map= table_list->map_exec;
-      table_list->table->pos_in_table_list= table_list;
+      if(table_list->jtbm_subselect)
+      {
+        table_list->jtbm_table_no= table_list->tablenr_exec;
+      }
+      else
+      {
+        table_list->table->tablenr= table_list->tablenr_exec;
+        table_list->table->map= table_list->map_exec;
+        table_list->table->pos_in_table_list= table_list;
+      }
       select_lex->leaf_tables.push_back(table_list);
     }
   }