From: Alexander Nozdrin
Date: May 11 2011 5:24pm
Subject: bzr commit into mysql-5.5 branch (alexander.nozdrin:3505) Bug#12429877
List-Archive: http://lists.mysql.com/commits/137116
X-Bug: 12429877
Message-Id: <201105111724.p4BHOOiJ012189@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2792557388948466780=="

--===============2792557388948466780==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/alik/MySQL/bzr/00/bug12429877/mysql-5.5-bug12429877.2/ based on revid:alexander.nozdrin@stripped

 3505 Alexander Nozdrin	2011-05-11
      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.

    modified:
      sql/sql_acl.cc
=== modified file 'sql/sql_acl.cc'
--- a/sql/sql_acl.cc	2011-03-21 14:22:13 +0000
+++ b/sql/sql_acl.cc	2011-05-11 17:24:22 +0000
@@ -3644,6 +3644,7 @@ int mysql_table_grant(THD *thd, TABLE_LI
   {						// 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 */


--===============2792557388948466780==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/alexander.nozdrin@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alexander.nozdrin@stripped\
#   zmdarb1p3qyw4bmz
# target_branch: file:///home/alik/MySQL/bzr/00/bug12429877/mysql-5.5-\
#   bug12429877.2/
# testament_sha1: a5cd9a5822e10e7d4953e55958f2ddd8657ab6ec
# timestamp: 2011-05-11 21:24:25 +0400
# base_revision_id: alexander.nozdrin@stripped\
#   xa4z7zx2vdy5qf1q
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZDyvLgAAZjfgEAQWWP//3/t
v+C////wUARNLT2wcaru9Xu697wlFNCnkMTCabRGgFA9TxR6jI9qGp6mjajTQZRGQ1PRPSn6NBRp
soAAAAGgAAlEaBCYRMTTJD0RtTQBgjRpo0ybQQbUkmgekmT1NqbUek2oZqYCZANGgyAAJQiU8TDS
nqNqZNPUyHqAAABoABkchkbjXp3+pLVOmKmffdHKgPcq4XfNl9js6ObWU3YVVTynTq0cjiz1MzS7
/r7+cfxK/r810qnZ2tfDR3SxZd56Psb5tCTEFGFqrec8ympq06G8EcVD97b6ZzQw7uuAjEMZR67O
JXFqzWwNKk4iZnmu4Ho0tRCKy0QqZees3PCZV6kRGVD77BS0QXck5HKgLAUU2Ar0iguSpJs5Ja+h
jiUmCKhZXGCIEBRmyJBXJS9Ax5VllKVzTtHyVUZRhRMoS3c+OnmIFdNFjjQJoTASughTO2REfFTj
36XiMhLSyax+rRWZJg/ET3PGxeFHVk8+l1RnFYfeiu2XTNUzLZgEgX5CMmSVEVSXWdoK8MJfVnWU
UjiBnEavNQWkOFtSwQ5+IWaijOoUCzUuhAXya5YpDC10dxkvkeyaiVG/GmCSqL0szics5T3oKXVE
LbQwzE/Wl1j6RGNUJxpilKsLFfYLSZW8WgxFMhU4xRlGhy7ePJj3Yhdg6EK3VOcWweizm6I+wJ0X
25uYxaq/ZnR+/0/DWechC/P17fBrrFVVOeOH+d0ttizvCG0nR7+po2wfDu2Ts8jv8AroUqe8jHqn
iuKrsbn44UjaeN0eu2l1XZ4+X0TdTTwuQ7U6hf6w/9kYHyOad/cbzthCjByTInNEMPKVgZ03G8Vz
0/MsWOTELeKEQWj5iTodE4wKy+4t27EQXhFaXeHZ6VjK+V03MVPASxsg7dwChJCdw8TS+LDgX8JG
W9FzLnV+RioB2IRT7r0nHPoq2nhspjNiYjgC2VmZYJy4ivbJDE6C4t33LL0zHQTL5TasJj+L2glj
oZkVysiIQjwFME0FtWS/kwq9s9rXsrQr6SHiu6cXlBhKSWPXmGJtg6c6tAnBiALDFalRpqSccsbm
ygwiJtunVLBMx1TUqrSZtCDsEXt9jUsCIwh6qskToCi0orY11FkNHdoRX5CCMaUczMIXAzR6M17Y
4qmGvhDgTgg7eL5EMYcVBklrHJmCoGcFJK9CCbkZhUeM6FEMo2tPUsSoBOOZDqc1zcVuSnrqnIqc
OpgJUE031cIK05JbAPQPeohEYllJvlQp7FV4oWGLNqFRzurkoLgaqKCSErL9BcSIoDBPGa6pU+aA
RBeU7gMQouQgoUJhY1cdAWZGTHgOQHAXtcmJi0SmhcLCIyIlpieJKYIix6GSsx6ZijmJ6rkQcyZt
lxpk4zSkgoXYKOQlB2Wy/WpXQFmlt/JyLJxsw0s95FncDC0wWBWKzdBUDx7lqgXLmUM51v39cRI2
ISQHlSVvD3EDdhz7cvwNJihSTWUTUa1lSdMoXkPHWCccgjVwutIQJxNQoEMLSbqsgpqTPQ/Ac5/x
dyRThQkJDyvLgA==


--===============2792557388948466780==--