diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-08-12 17:50:23 +0400 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-08-12 17:50:23 +0400 |
| commit | 29c4873ad5bb0e0f3eb1faf3f22ec00f11ca5cb4 (patch) | |
| tree | 9e8417877eab9778cb09f99e71c11401e7749bbc /sql/sql_show.cc | |
| parent | 265a6edd23cfdb69c6ac072bf01887f7aed1168c (diff) | |
| parent | 00496b7acd1f2ac8b099ba7e6a4c7bbf09178384 (diff) | |
| download | mariadb-git-29c4873ad5bb0e0f3eb1faf3f22ec00f11ca5cb4.tar.gz | |
Commit on behalf of Dmitry Lenev.
Merge his patch for Bug#52044 into 5.5, and apply
review comments.
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 139568bb9d5..3f0c0b9eaf9 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -3273,8 +3273,8 @@ static int fill_schema_table_from_frm(THD *thd, TABLE_LIST *tables, /* TODO: investigate if in this particular situation we can get by - simply obtaining internal lock of data-dictionary (ATM it - is LOCK_open) instead of obtaning full-blown metadata lock. + simply obtaining internal lock of the data-dictionary + instead of obtaining full-blown metadata lock. */ if (try_acquire_high_prio_shared_mdl_lock(thd, &table_list, can_deadlock)) { |