From 96daf87a10e132e2bbb58e96343ffa0513b56870 Mon Sep 17 00:00:00 2001
From: Alexander Nozdrin <alexander.nozdrin@oracle.com>
Date: Mon, 16 May 2011 12:50:42 +0400
Subject: [PATCH] A patch for Bug#12429877: QUERY_TABLES_LIST::SROUTINES IS NOT
 FREED IN FLUSH_READ_LOCK (VALGRIND WARNING).

The problem was that under some circustances the memory allocated
for Query_tables_list::sroutines was not freed properly.
The cause of this problem was the absence of
LEX::restore_backup_query_tables_list() call in one of the branches
in mysql_table_grant() function.
---
 sql/sql_acl.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 18758130767..0eb05489015 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -3644,6 +3644,7 @@ int mysql_table_grant(THD *thd, TABLE_LIST *table_list,
   {						// Should never happen
     /* Restore the state of binlog format */
     DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row());
+    thd->lex->restore_backup_query_tables_list(&backup);
     if (save_binlog_row_based)
       thd->set_current_stmt_binlog_format_row();
     DBUG_RETURN(TRUE);				/* purecov: deadcode */