diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-08-18 13:29:04 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-08-18 13:29:04 +0200 |
| commit | eb498cce4dafc2eda285c71ed96d64e451f02ec2 (patch) | |
| tree | b38d061771d52ab55fe9d428e45627d4c08d5f63 /sql/sql_base.h | |
| parent | 6293c44ff6debb4f617260df727b281e77a41b5c (diff) | |
| parent | e28d6ee66a8404dd0f8fe3aaabb9d72544e5d42e (diff) | |
| download | mariadb-git-eb498cce4dafc2eda285c71ed96d64e451f02ec2.tar.gz | |
Manual merge from mysql-5.5-bugfixing to mysql-5.5-runtime.
Diffstat (limited to 'sql/sql_base.h')
| -rw-r--r-- | sql/sql_base.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_base.h b/sql/sql_base.h index ca5ca31ab6a..7a6f18545ad 100644 --- a/sql/sql_base.h +++ b/sql/sql_base.h @@ -241,7 +241,6 @@ 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_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); |