From: Dmitry Lenev
Date: December 2 2010 9:22am
Subject: bzr commit into mysql-trunk-bugfixing branch (Dmitry.Lenev:3396) Bug#27480
List-Archive: http://lists.mysql.com/commits/125779
X-Bug: 27480
Message-Id: <20101202092209.958FDE58F6@mockturtle>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2027251149=="

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

#At file:///home/dlenev/src/bzr/mysql-trunk-bugfixing-bug27480/ based on revid:dmitry.lenev@stripped

 3396 Dmitry Lenev	2010-12-02
      Prerequisite patch for Bug#27480 (Extend CREATE TEMPORARY
      TABLES privilege to allow temp table operations).
      
      Review fixes in progress. Fixed issues discovered by
      flush_read_lock.test.

    modified:
      sql/sql_parse.cc
      sql/sql_update.cc
=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc	2010-12-01 10:07:22 +0000
+++ b/sql/sql_parse.cc	2010-12-02 09:21:50 +0000
@@ -494,8 +494,8 @@ void init_update_queries(void)
   sql_command_flags[SQLCOM_OPTIMIZE]|=        CF_HA_CLOSE;
   sql_command_flags[SQLCOM_ANALYZE]|=         CF_HA_CLOSE;
   sql_command_flags[SQLCOM_CHECK]|=           CF_HA_CLOSE;
-  sql_command_flags[SQLCOM_CREATE_INDEX]=     CF_HA_CLOSE;
-  sql_command_flags[SQLCOM_DROP_INDEX]=       CF_HA_CLOSE;
+  sql_command_flags[SQLCOM_CREATE_INDEX]|=    CF_HA_CLOSE;
+  sql_command_flags[SQLCOM_DROP_INDEX]|=      CF_HA_CLOSE;
   sql_command_flags[SQLCOM_PRELOAD_KEYS]|=    CF_HA_CLOSE;
   sql_command_flags[SQLCOM_ASSIGN_TO_KEYCACHE]|=  CF_HA_CLOSE;
 }

=== modified file 'sql/sql_update.cc'
--- a/sql/sql_update.cc	2010-11-18 16:34:56 +0000
+++ b/sql/sql_update.cc	2010-12-02 09:21:50 +0000
@@ -1130,6 +1130,10 @@ int mysql_multi_update_prepare(THD *thd)
                        0, 0) ||
           check_grant(thd, want_privilege, tl, FALSE, 1, FALSE))
         DBUG_RETURN(TRUE);
+
+      if (is_temporary_table(tl))
+        tl->table->grant= tl->grant;
+
     }
   }
 


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dmitry.lenev@stripped
# target_branch: file:///home/dlenev/src/bzr/mysql-trunk-bugfixing-\
#   bug27480/
# testament_sha1: 2697e4816778164733ee9eccb61ede69149f367e
# timestamp: 2010-12-02 12:22:09 +0300
# source_branch: file:///home/dlenev/src/bzr/mysql-trunk-bugfixing/
# base_revision_id: dmitry.lenev@stripped\
#   1jgmoh345zmooda4
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSezmCYAAiBfgFQQWGP//39n
/Gq////0UAU6PZG2LVYZSBtWwlEIRhTwjJiaQ2JTCAD0QxNMnpppGhxkyaaYTIyBgRiaMEYQaNMA
AglCDUaJ6mKGmKHqBpoGjJoepoB6g2oGhxkyaaYTIyBgRiaMEYQaNMAAgkoTQMQATSaaZFP1TyNR
iDRo/U1AABEOPG+uGuk2N2jboR3yaziDVFpdCgml/7hrksVlBsgTjGhRD+Kz7jhVVVTw7k3ugiYS
PSK5xrH2teXhvruz+253n3np47sj761EETBnZU1NJ5xtC6CnPFhpLDRgaWQoNVA3SpHfq31RhMnm
gjkgXLZsDRrnuuqLwhpAvzUNILQRCLgVmQ5zzQxznSG2zANduBuxPEMUKZCqIlnXBEGeITSCpOkZ
pAUCJYHiBZJoe/VZbO3MjUZKQDt5mcJKgnQodzSYNB09jDpZN6kgTGtpbK+pdMQkucaQHYk9FMjw
9wTECsB44jEYZn8GcwXVrXHOmoljQhRBVJE76QNLDWtpB2kTX3d9kGZsQ0ts3Wk50LygoaMDtw1z
eRLjn4Kea4ZJ5LlMWTSmJcWmcDUW0cQK4YqlBIUszhA0kHFbkceiYi0LF/Z3yaoOBcuH8OAyooVx
jjsOEPBVDJTW6nmVhTmytxVfEkS38uO2E4ZqazYcTUlhOWhGWoes11NcIWDKLrAw55aYSLy7SGiY
mDXXztx7CE5rrORubfIpNnlMCTwxa2gB8bHEhgOzkDSwsM+JxZp2mexrXqhCs1cqyRGBXWKWoTsX
l85w8ydhEliVegqQaW7TDBHrkE8vKU/RCSiiqvY6fr6/Q8BzP4Ly/OvUZysLdw303F9wbzyxI+/L
rPySK76m+fBkM5jx1xvHAa6VXiTvOA4kOA/N9DlNnMXIjXJ3Rq8HU1yfF4T1HPzAdJKiQI9J2Xpm
JG1vt8hEeB1GEUMC8D79rIlP9IwqiIa4bSmuywYePUdh0+8dU/T4GhYsgKvebjLwSrF1qGlQMOpw
c8d84py0zJ7T8Nt/ZM/0c0SrEvoMs+ws4mMe5N4B6c91dm67AgGlANsHiaUYrkBzXfaaztHTLhia
B1PimDZR1UfyaZuTBoB37d0/cY2OYwuG3mgszLxKyQiQjMsfGrfXEtv2TKeJxEkByXzYLo4MM6dW
UEWhP2ih6i81vQZNkD/I16vW9x5FzCJ9XIPeh7ewLzxtHeR4THRpuHE/mcFmQWJ6Hmea8bj5ibE0
PpPgLa5bTLSI01JOcp0vGssPhDic5Al7FE59xKT7ipDAcpiU9FqFDHubxwSsRri4uQkq7+Wh1KGR
6KFHGE/kksffabMHmNJ6luA5gX07mESo3Iw3jBm8OQHEnRbMDwLjuOh4qQk1HIFsdJcGa32EePPI
70LyY07VvAgb7zqXgqInQrTDBepbQgmyNQHSKhcyiiZDSZwk4vzgYkCJTTUMRUwGJhZ23GdCqHLZ
AU5sCDJk+5lf+iUEetyY1QhGo4iryYMDem5J6pOI2EzR5RyMytIoNgM4aNRiOSDVpGjQyMYWIi7X
rswST1uS45zRGSxL0d54CsKgiucPTyD9jagGP5kmqVLpR8RSEhDVtNqqsBhSQgKpmKKXIZ1xxgoy
msLc/onPXRkd3bDkiGzkH06JRvTB/llQnDNMImVoMsK7yDrvJNU4/FUmTNqLdoxiFctG3sE2wsp7
SJiBSPHtrrHFaPhXUgOgFbW+EixdsGS88yTLuw/4u5IpwoSBPZzBMA==


--===============2027251149==--