summaryrefslogtreecommitdiff
path: root/sql/sql_show.cc
diff options
context:
space:
mode:
authorKonstantin Osipov <kostja@sun.com>2010-08-12 17:50:23 +0400
committerKonstantin Osipov <kostja@sun.com>2010-08-12 17:50:23 +0400
commit8673d2b20fe3cb1353f7b9b157e72dbf45382a48 (patch)
tree9e8417877eab9778cb09f99e71c11401e7749bbc /sql/sql_show.cc
parent65d118b1a4cb3cb4d75226b9280ee80b0d644f70 (diff)
parent5fff906edd3d7a5d999cec5403f009f33f8dfb81 (diff)
downloadmariadb-git-8673d2b20fe3cb1353f7b9b157e72dbf45382a48.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.cc4
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))
{