ttdevelopers
diff --git a/‎sql/ha_ndbcluster.cc‎
Lines changed: 4 additions & 3 deletions b/‎sql/ha_ndbcluster.cc‎
Lines changed: 4 additions & 3 deletions
diff --git a/‎sql/lock.cc‎
Lines changed: 2 additions & 5 deletions b/‎sql/lock.cc‎
Lines changed: 2 additions & 5 deletions
diff --git a/‎sql/lock.h‎
Lines changed: 7 additions & 8 deletions b/‎sql/lock.h‎
Lines changed: 7 additions & 8 deletions
diff --git a/‎sql/mdl.h‎
Lines changed: 4 additions & 0 deletions b/‎sql/mdl.h‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎sql/sp_head.cc‎
Lines changed: 8 additions & 3 deletions b/‎sql/sp_head.cc‎
Lines changed: 8 additions & 3 deletions
diff --git a/‎sql/sp_head.h‎
Lines changed: 3 additions & 1 deletion b/‎sql/sp_head.h‎
Lines changed: 3 additions & 1 deletion
@@ -7408,9 +7408,10 @@ int ndbcluster_find_files(handlerton *hton, THD *thd,
       DBUG_PRINT("info", ("Remove table %s/%s", db, file_name_str));
       // Delete the table and all related files
       TABLE_LIST table_list;
-      bzero((char*) &table_list,sizeof(table_list));
-      table_list.db= (char*) db;
-      table_list.alias= table_list.table_name= (char*)file_name_str;
+      table_list.init_one_table(db, strlen(db), file_name_str,
+                                strlen(file_name_str), file_name_str,
+                                TL_WRITE);
+      table_list.mdl_request.set_tpye(MDL_EXCLUSIVE);
       (void)mysql_rm_table_part2(thd, &table_list,
                                  FALSE,   /* if_exists */
                                  FALSE,   /* drop_temporary */ 
 
@@ -880,6 +880,8 @@ static MYSQL_LOCK *get_lock_data(THD *thd, TABLE **table_ptr, uint count,
          before calling it. Also it cannot be called while holding
          LOCK_open mutex. Both these invariants are enforced by asserts
          in MDL_context::acquire_locks().
+   @note Initialization of MDL_request members of TABLE_LIST elements
+         is a responsibility of the caller.
 
    @retval FALSE  Success.
    @retval TRUE   Failure (OOM or thread was killed).
@@ -894,12 +896,7 @@ bool lock_table_names(THD *thd, TABLE_LIST *table_list)
   global_request.init(MDL_key::GLOBAL, "", "", MDL_INTENTION_EXCLUSIVE);
 
   for (lock_table= table_list; lock_table; lock_table= lock_table->next_local)
-  {
-    lock_table->mdl_request.init(MDL_key::TABLE,
-                                 lock_table->db, lock_table->table_name,
-                                 MDL_EXCLUSIVE);
     mdl_requests.push_front(&lock_table->mdl_request);
-  }
 
   mdl_requests.push_front(&global_request);
 
 
@@ -15,33 +15,32 @@ typedef struct st_mysql_lock MYSQL_LOCK;
 #define MYSQL_OPEN_TEMPORARY_ONLY               0x0004
 #define MYSQL_LOCK_IGNORE_GLOBAL_READ_ONLY      0x0008
 #define MYSQL_LOCK_LOG_TABLE                    0x0010
-#define MYSQL_OPEN_TAKE_UPGRADABLE_MDL          0x0020
 /**
   Do not try to acquire a metadata lock on the table: we
   already have one.
 */
-#define MYSQL_OPEN_HAS_MDL_LOCK                 0x0040
+#define MYSQL_OPEN_HAS_MDL_LOCK                 0x0020
 /**
   If in locked tables mode, ignore the locked tables and get
   a new instance of the table.
 */
-#define MYSQL_OPEN_GET_NEW_TABLE                0x0080
+#define MYSQL_OPEN_GET_NEW_TABLE                0x0040
 /** Don't look up the table in the list of temporary tables. */
-#define MYSQL_OPEN_SKIP_TEMPORARY               0x0100
+#define MYSQL_OPEN_SKIP_TEMPORARY               0x0080
 /** Fail instead of waiting when conficting metadata lock is discovered. */
-#define MYSQL_OPEN_FAIL_ON_MDL_CONFLICT         0x0200
+#define MYSQL_OPEN_FAIL_ON_MDL_CONFLICT         0x0100
 /** Open tables using MDL_SHARED lock instead of one specified in parser. */
-#define MYSQL_OPEN_FORCE_SHARED_MDL             0x0400
+#define MYSQL_OPEN_FORCE_SHARED_MDL             0x0200
 /**
   Open tables using MDL_SHARED_HIGH_PRIO lock instead of one specified
   in parser.
 */
-#define MYSQL_OPEN_FORCE_SHARED_HIGH_PRIO_MDL   0x0800
+#define MYSQL_OPEN_FORCE_SHARED_HIGH_PRIO_MDL   0x0400
 /**
   When opening or locking the table, use the maximum timeout
   (LONG_TIMEOUT = 1 year) rather than the user-supplied timeout value.
 */
-#define MYSQL_LOCK_IGNORE_TIMEOUT               0x1000
+#define MYSQL_LOCK_IGNORE_TIMEOUT               0x0800
 
 /** Please refer to the internals manual. */
 #define MYSQL_OPEN_REOPEN  (MYSQL_OPEN_IGNORE_FLUSH |\
 
@@ -308,6 +308,10 @@ class MDL_request
   MDL_key key;
 
 public:
+  static void *operator new(size_t size, MEM_ROOT *mem_root) throw ()
+  { return alloc_root(mem_root, size); }
+  static void operator delete(void *ptr, MEM_ROOT *mem_root) {}
+
   void init(MDL_key::enum_mdl_namespace namespace_arg,
             const char *db_arg, const char *name_arg,
             enum_mdl_type mdl_type_arg);
 
@@ -4010,6 +4010,11 @@ sp_head::add_used_tables_to_table_list(THD *thd,
       table->prelocking_placeholder= 1;
       table->belong_to_view= belong_to_view;
       table->trg_event_map= stab->trg_event_map;
+      /*
+        Since we don't allow DDL on base tables in prelocked mode it
+        is safe to infer the type of metadata lock from the type of
+        table lock.
+      */
       table->mdl_request.init(MDL_key::TABLE, table->db, table->table_name,
                               table->lock_type >= TL_WRITE_ALLOW_WRITE ?
                               MDL_SHARED_WRITE : MDL_SHARED_READ);
@@ -4040,7 +4045,8 @@ sp_head::add_used_tables_to_table_list(THD *thd,
 TABLE_LIST *
 sp_add_to_query_tables(THD *thd, LEX *lex,
 		       const char *db, const char *name,
-		       thr_lock_type locktype)
+                       thr_lock_type locktype,
+                       enum_mdl_type mdl_type)
 {
   TABLE_LIST *table;
 
@@ -4055,8 +4061,7 @@ sp_add_to_query_tables(THD *thd, LEX *lex,
   table->select_lex= lex->current_select;
   table->cacheable_table= 1;
   table->mdl_request.init(MDL_key::TABLE, table->db, table->table_name,
-                          table->lock_type >= TL_WRITE_ALLOW_WRITE ?
-                          MDL_SHARED_WRITE : MDL_SHARED_READ);
+                          mdl_type);
 
   lex->add_to_query_tables(table);
   return table;
 
@@ -1346,7 +1346,9 @@ set_routine_security_ctx(THD *thd, sp_head *sp, bool is_proc,
 TABLE_LIST *
 sp_add_to_query_tables(THD *thd, LEX *lex,
 		       const char *db, const char *name,
-		       thr_lock_type locktype);
+                       thr_lock_type locktype,
+                       enum_mdl_type mdl_type);
+
 Item *
 sp_prepare_func_item(THD* thd, Item **it_addr);