diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-05-28 09:47:58 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-05-28 09:47:58 +0400 |
| commit | 59a99129634a020bc618324db1c36f36f9e14493 (patch) | |
| tree | 88543c956886365a2376e01ce26a0436c38a4454 /sql/sql_base.h | |
| parent | 7758bdc8aad36927db408b4bc9546d39ef646c3c (diff) | |
| parent | eb27f163a31ca6995c98ada9fc678176c041dd93 (diff) | |
| download | mariadb-git-59a99129634a020bc618324db1c36f36f9e14493.tar.gz | |
Auto-merge from mysql-trunk.
Diffstat (limited to 'sql/sql_base.h')
| -rw-r--r-- | sql/sql_base.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_base.h b/sql/sql_base.h index 0c16151e43a..0fe70e4bc9d 100644 --- a/sql/sql_base.h +++ b/sql/sql_base.h @@ -217,7 +217,7 @@ TABLE *open_n_lock_single_table(THD *thd, TABLE_LIST *table_l, thr_lock_type lock_type, uint flags); bool open_normal_and_derived_tables(THD *thd, TABLE_LIST *tables, uint flags); bool lock_tables(THD *thd, TABLE_LIST *tables, uint counter, uint flags); -int abort_and_upgrade_lock(ALTER_PARTITION_PARAM_TYPE *lpt); +int abort_and_upgrade_lock_and_close_table(ALTER_PARTITION_PARAM_TYPE *lpt); int decide_logging_format(THD *thd, TABLE_LIST *tables); void free_io_cache(TABLE *entry); void intern_close_table(TABLE *entry); |