summaryrefslogtreecommitdiff
path: root/sql/sql_base.h
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2012-12-12 23:16:54 -0800
committerIgor Babaev <igor@askmonty.org>2012-12-12 23:16:54 -0800
commit65820439bdafeead66496b489c076012c334c710 (patch)
treeba5134a5674e237eb510a6b10a1a7cac28ec9f26 /sql/sql_base.h
parent109c104d07c6cce68ecae66c1a4dcdb83826954f (diff)
downloadmariadb-git-65820439bdafeead66496b489c076012c334c710.tar.gz
Fixed bug mdev-3891.
If a query referenced some system statistical tables, but not all of them, then executing an ANALYZE command simultaneously with this query could lead to a deadlock. The fix prohibited reading statistics from system statistical tables for such queries. Removed the function unlock_tables_n_open_system_tables_for_write() as not used anymore. Performed some minor refactoring of the code in sql_statistics.cc.
Diffstat (limited to 'sql/sql_base.h')
-rw-r--r--sql/sql_base.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/sql_base.h b/sql/sql_base.h
index d45652927de..c4cd7f467a0 100644
--- a/sql/sql_base.h
+++ b/sql/sql_base.h
@@ -275,9 +275,6 @@ bool is_equal(const LEX_STRING *a, const LEX_STRING *b);
/* Functions to work with system tables. */
bool open_system_tables_for_read(THD *thd, TABLE_LIST *table_list,
Open_tables_backup *backup);
-bool unlock_tables_n_open_system_tables_for_write(THD *thd,
- TABLE_LIST *table_list,
- Open_tables_backup *backup);
void close_system_tables(THD *thd, Open_tables_backup *backup);
void close_mysql_tables(THD *thd);
TABLE *open_system_table_for_update(THD *thd, TABLE_LIST *one_table);