database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Manual merge from mysql-5.5-bugfixing to mysql-5.5-runtime.

Browse Source
This commit is contained in:
Jon Olav Hauglid
2010-08-18 13:29:04 +02:00
parent 6293c44ff6 e28d6ee66a
commit eb498cce4d
235 changed files with 12924 additions and 2707 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_base.h
View File

@ -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);