From: Dmitry Lenev
Date: December 3 2010 6:42am
Subject: bzr commit into mysql-trunk-bugfixing branch (Dmitry.Lenev:3397) Bug#27480
List-Archive: http://lists.mysql.com/commits/125888
X-Bug: 27480
Message-Id: <20101203064238.6DA1CE58F6@mockturtle>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1495060034=="

--===============1495060034==
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

 3397 Dmitry Lenev	2010-12-03
      Prerequisite patch for Bug#27480 (Extend CREATE TEMPORARY
      TABLES privilege to allow temp table operations).
      
      Review fixes in progress. Fixed merge.test failures.

    modified:
      sql/sql_admin.cc
      sql/sql_base.cc
      storage/myisammrg/ha_myisammrg.cc
=== modified file 'sql/sql_admin.cc'
--- a/sql/sql_admin.cc	2010-12-01 10:07:22 +0000
+++ b/sql/sql_admin.cc	2010-12-03 06:42:19 +0000
@@ -293,9 +293,11 @@ static bool mysql_admin_table(THD* thd, 
 
   /*
     Close all temporary tables which were pre-open to simplify
-    privilege checking.
+    privilege checking. Clear all references to closed tables.
   */
   close_thread_tables(thd);
+  for (table= tables; table; table= table->next_local)
+    table->table= NULL;
 
   for (table= tables; table; table= table->next_local)
   {

=== modified file 'sql/sql_base.cc'
--- a/sql/sql_base.cc	2010-12-02 06:57:30 +0000
+++ b/sql/sql_base.cc	2010-12-03 06:42:19 +0000
@@ -4345,20 +4345,20 @@ open_and_process_table(THD *thd, LEX *le
     */
     error= open_and_process_temporary_table(thd, tables);
 
-    if (!error && !tables->table)
-    {
-      /*
-        For the tables added by the pre-locking code, attempt to open
-        the table but fail silently if the table does not exist.
-        The real failure will occur when/if a statement attempts to use
-        that table.
-      */
-      No_such_table_error_handler no_such_table_handler;
-      thd->push_internal_handler(&no_such_table_handler);
-      error= open_table(thd, tables, new_frm_mem, ot_ctx);
-      thd->pop_internal_handler();
-      safe_to_ignore_table= no_such_table_handler.safely_trapped_errors();
-    }
+    if (error || tables->table)
+      goto end;
+
+    /*
+      For the tables added by the pre-locking code, attempt to open
+      the table but fail silently if the table does not exist.
+      The real failure will occur when/if a statement attempts to use
+      that table.
+    */
+    No_such_table_error_handler no_such_table_handler;
+    thd->push_internal_handler(&no_such_table_handler);
+    error= open_table(thd, tables, new_frm_mem, ot_ctx);
+    thd->pop_internal_handler();
+    safe_to_ignore_table= no_such_table_handler.safely_trapped_errors();
   }
   else
     error= open_table(thd, tables, new_frm_mem, ot_ctx);

=== modified file 'storage/myisammrg/ha_myisammrg.cc'
--- a/storage/myisammrg/ha_myisammrg.cc	2010-10-20 19:02:59 +0000
+++ b/storage/myisammrg/ha_myisammrg.cc	2010-12-03 06:42:19 +0000
@@ -479,6 +479,11 @@ int ha_myisammrg::add_children_list(void
     child_l->set_table_ref_id(mrg_child_def->get_child_table_ref_type(),
                               mrg_child_def->get_child_def_version());
     /*
+      Copy parent's prelocking attribute to allow opening of child
+      temporary residing in the prelocking list.
+    */
+    child_l->prelocking_placeholder= parent_l->prelocking_placeholder;
+    /*
       For statements which acquire a SNW metadata lock on a parent table and
       then later try to upgrade it to an X lock (e.g. ALTER TABLE), SNW
       locks should be also taken on the children tables.


--===============1495060034==
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: 808f351a7c8b600ae7d6923abbe7719158decce5
# timestamp: 2010-12-03 09:42:38 +0300
# source_branch: file:///home/dlenev/src/bzr/mysql-trunk-bugfixing/
# base_revision_id: dmitry.lenev@stripped\
#   wjjmdal1a3qsbmy5
# 
# Begin bundle
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
7w3DQA==


--===============1495060034==--