diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-11 20:02:50 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-11 20:02:50 +0400 |
| commit | a6cf28a7a17b9b5fc85035f4ac965f7167ce6ff1 (patch) | |
| tree | 89c163aad88a201330e15a7e904ca11d6c1001e5 /sql/sql_base.h | |
| parent | db9672cfded3403f4145564bad8e6b78f47ba13c (diff) | |
| parent | af2de573256ec02dfe71db97ee1f80aa4e6c1e92 (diff) | |
| download | mariadb-git-a6cf28a7a17b9b5fc85035f4ac965f7167ce6ff1.tar.gz | |
Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:
Text conflict in sql/sql_base.cc
Text conflict in sql/sql_partition.cc
Text conflict in sql/sql_priv.h
Text conflict in sql/sql_show.cc
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 a57666afe49..4d6be93b532 100644 --- a/sql/sql_base.h +++ b/sql/sql_base.h @@ -218,7 +218,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); |