More merge fixes:

- mdl.cc and mdl.h merged completely
- mysql_system_tables*.sql merged completely
- Fixed wrong merge of lock_tables
- Added some missing functions:
 - bool THD::notify_shared_lock()
 - Dynamic_array::pop, Dynamic_array::del
- Added MDL_context_owner to THD
- Added metadata_locks_hash_instances

1 files changed, 11 insertions, 0 deletions

diff --git a/sql/sql_array.h b/sql/sql_array.h
index f07126bc0ef..9ac27cca63b 100644
--- a/sql/sql_array.h
+++ b/sql/sql_array.h
@@ -124,6 +124,17 @@ public:
     return (insert_dynamic(&array, (uchar*)&el));
   }
 
+  /// Pops the last element. Does nothing if array is empty.
+  Elem& pop()
+  {
+    return *((Elem*)pop_dynamic(&array));
+  }
+
+  void del(uint idx)
+  {
+    delete_dynamic_element(&array, idx);
+  }
+
   int elements()
   {
     return array.elements;