diff options
| author | Mattias Jonsson <mattias.jonsson@sun.com> | 2010-05-10 15:17:06 +0200 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@sun.com> | 2010-05-10 15:17:06 +0200 |
| commit | af2de573256ec02dfe71db97ee1f80aa4e6c1e92 (patch) | |
| tree | e91973e648c1ead580581c0b3767ad66eb3ac7d0 /sql/mysql_priv.h | |
| parent | 1c5200f67d3a5669b987979227d5e314082b00db (diff) | |
| parent | 07c765aa4234bfaaaacf19068aa6d45aa43c5c1e (diff) | |
| download | mariadb-git-af2de573256ec02dfe71db97ee1f80aa4e6c1e92.tar.gz | |
merge
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index cbebdc6a144..57875089cd8 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1736,7 +1736,7 @@ extern pthread_mutex_t LOCK_gdl; #define WFRM_PACK_FRM 4 #define WFRM_KEEP_SHARE 8 bool mysql_write_frm(ALTER_PARTITION_PARAM_TYPE *lpt, 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); void close_open_tables_and_downgrade(ALTER_PARTITION_PARAM_TYPE *lpt); void mysql_wait_completed_table(ALTER_PARTITION_PARAM_TYPE *lpt, TABLE *my_table); |