diff --git a/sql/sql_test.cc b/sql/sql_test.cc
index 02a4056d798..85fda77ad9f 100644
--- a/sql/sql_test.cc
+++ b/sql/sql_test.cc
@@ -553,7 +553,7 @@ void Dbug_table_list_dumper::dump_one_struct(TABLE_LIST *tbl) {
   if (tbl->nested_join)
     fprintf(out, "|<nested_j>nested_j=%p", tbl->nested_join);
   if (tbl->join_list) fprintf(out, "|<join_list>join_list=%p", tbl->join_list);
-  if (tbl->on_expr) fprintf(out, "|<on_expr>on_expr=%p", tbl->on_expr);
+  // if (tbl->on_expr) fprintf(out, "|<on_expr>on_expr=%p", tbl->on_expr);
   fprintf(out, "\"\n");
   fprintf(out, "  shape = \"record\"\n];\n\n");
 
@@ -615,6 +615,7 @@ int Dbug_table_list_dumper::dump_graph(SELECT_LEX *select_lex,
 
   TABLE_LIST *tbl;
   tables_fifo.reset();
+  tbl_lists.reset();
   dump_one_struct(first_leaf);
   while (tables_fifo.pop_first(&tbl)) {
     dump_one_struct(tbl);
@@ -636,7 +637,7 @@ int Dbug_table_list_dumper::dump_graph(SELECT_LEX *select_lex,
   fputs("}", out);
   fclose(out);
 
-  char filename2[500];
+  char filename2[506];
   filename[strlen(filename) - 1] = 0;
   filename[strlen(filename) - 1] = 0;
   sprintf(filename2, "%s.query", filename);