diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-12-01 16:27:03 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-12-01 16:27:03 +0300 |
| commit | 1ed585adff48bffbd5440eda246e1918d53ca7ac (patch) | |
| tree | f22662f715c12704721d57ac2670684f125d9eba /sql/event_db_repository.cc | |
| parent | 379a441d9cc2c60585f96150bcacb41312c260f6 (diff) | |
| download | mariadb-git-1ed585adff48bffbd5440eda246e1918d53ca7ac.tar.gz | |
Backport of:
---------------------------------------------
2630.7.3 Konstantin Osipov 2008-06-02
Various style changes preceding the removal of reopen_table().
(Post-review fixes for WL#3726).
sql/event_db_repository.cc:
Update to use the new signature of TABLE_LIST::init_one_table().
sql/mysql_priv.h:
Move close_cached_table() and wait_while_table_is_used()
to sql_base.cc.
sql/sql_base.cc:
Move close_cached_table() and wait_while_table_is_used()
from sql_table.cc.
sql/sql_table.cc:
Move close_cached_table() and wait_while_table_is_used()
to sql_base.cc.
sql/table.h:
Update the signature of TABLE_LIST::init_one_table().
Diffstat (limited to 'sql/event_db_repository.cc')
| -rw-r--r-- | sql/event_db_repository.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/event_db_repository.cc b/sql/event_db_repository.cc index 0cf16e3a8a4..b17785a6be7 100644 --- a/sql/event_db_repository.cc +++ b/sql/event_db_repository.cc @@ -554,7 +554,7 @@ Event_db_repository::open_event_table(THD *thd, enum thr_lock_type lock_type, TABLE_LIST tables; DBUG_ENTER("Event_db_repository::open_event_table"); - tables.init_one_table("mysql", "event", lock_type); + tables.init_one_table("mysql", "event", "event", lock_type); alloc_mdl_locks(&tables, thd->mem_root); if (simple_open_n_lock_tables(thd, &tables)) @@ -1109,7 +1109,7 @@ Event_db_repository::check_system_tables(THD *thd) /* Check mysql.db */ - tables.init_one_table("mysql", "db", TL_READ); + tables.init_one_table("mysql", "db", "db", TL_READ); alloc_mdl_locks(&tables, thd->mem_root); if (simple_open_n_lock_tables(thd, &tables)) @@ -1127,7 +1127,7 @@ Event_db_repository::check_system_tables(THD *thd) close_thread_tables(thd); } /* Check mysql.user */ - tables.init_one_table("mysql", "user", TL_READ); + tables.init_one_table("mysql", "user", "user", TL_READ); alloc_mdl_locks(&tables, thd->mem_root); if (simple_open_n_lock_tables(thd, &tables)) @@ -1148,7 +1148,7 @@ Event_db_repository::check_system_tables(THD *thd) close_thread_tables(thd); } /* Check mysql.event */ - tables.init_one_table("mysql", "event", TL_READ); + tables.init_one_table("mysql", "event", "event", TL_READ); alloc_mdl_locks(&tables, thd->mem_root); if (simple_open_n_lock_tables(thd, &tables)) |