diff options
| author | Alexander Barkov <bar@mysql.com> | 2010-02-17 12:24:47 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mysql.com> | 2010-02-17 12:24:47 +0400 |
| commit | 8780277b83f06c64922120f89c6e25b490c463cb (patch) | |
| tree | 470d806f908f42a4eaf28d397f33be1e76b383a3 /sql/sql_help.cc | |
| parent | cf718fe9b77e97e641bddbb1438ed5d60c455e2e (diff) | |
| parent | ab293e26c385d3dfc1b51923b50fd5f2ac158ee0 (diff) | |
| download | mariadb-git-8780277b83f06c64922120f89c6e25b490c463cb.tar.gz | |
Merging from mysql-next-mr
Diffstat (limited to 'sql/sql_help.cc')
| -rw-r--r-- | sql/sql_help.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/sql_help.cc b/sql/sql_help.cc index 003741a7ddc..e9b15e07e9d 100644 --- a/sql/sql_help.cc +++ b/sql/sql_help.cc @@ -653,8 +653,14 @@ bool mysqld_help(THD *thd, const char *mask) tables[3].alias= tables[3].table_name= (char*) "help_keyword"; tables[3].lock_type= TL_READ; tables[0].db= tables[1].db= tables[2].db= tables[3].db= (char*) "mysql"; + init_mdl_requests(tables); - Open_tables_state open_tables_state_backup; + /* + HELP must be available under LOCK TABLES. + Reset and backup the current open tables state to + make it possible. + */ + Open_tables_backup open_tables_state_backup; if (open_system_tables_for_read(thd, tables, &open_tables_state_backup)) goto error2; |