From b1f765a98a1b5b8ca66c11cb4a62f8362b62964f Mon Sep 17 00:00:00 2001 From: Guilhem Bichot Date: Mon, 19 Oct 2009 15:23:42 +0200 Subject: [PATCH] Back-port from 6.0 of the fix for BUG#41759: "Valgrind warning: Invalid read of size 1 open_tables() with ps-protocol" (from revid:sergefp@mysql.com-20081227013233-f9n2by8romt37hyi) --- sql/sql_base.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sql/sql_base.cc b/sql/sql_base.cc index e5005f42b0d..770694dd472 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -4516,9 +4516,6 @@ int open_tables(THD *thd, TABLE_LIST **start, uint *counter, uint flags) */ for (tables= *start; tables ;tables= tables->next_global) { - DBUG_PRINT("tcache", ("opening table: '%s'.'%s' item: 0x%lx", - tables->db, tables->table_name, (long) tables)); - safe_to_ignore_table= FALSE; /* @@ -4555,6 +4552,8 @@ int open_tables(THD *thd, TABLE_LIST **start, uint *counter, uint flags) } DBUG_RETURN(-1); } + DBUG_PRINT("tcache", ("opening table: '%s'.'%s' item: 0x%lx", + tables->db, tables->table_name, (long) tables)); (*counter)++; /*