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

Merge maria-5.5-mwl248 -> 10.0-base.

Browse Source
This commit is contained in:
Igor Babaev
2012-12-16 21:33:17 -08:00
parent 7760efad74 e44253a125
commit 1b62f0f58c
89 changed files with 8929 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_base.h
View File

@ -307,6 +307,14 @@ int update_virtual_fields(THD *thd, TABLE *table,
enum enum_vcol_update_mode vcol_update_mode= VCOL_UPDATE_FOR_READ);
int dynamic_column_error_message(enum_dyncol_func_result rc);
/* open_and_lock_tables with optional derived handling */
int open_and_lock_tables_derived(THD *thd, TABLE_LIST *tables, bool derived);
extern "C" int simple_raw_key_cmp(void* arg, const void* key1,
const void* key2);
extern "C" int count_distinct_walk(void *elem, element_count count, void *arg);
int simple_str_key_cmp(void* arg, uchar* key1, uchar* key2);
extern TABLE *unused_tables;
extern Item **not_found_item;
extern Field *not_found_field;
@ -473,7 +481,6 @@ open_tables(THD *thd, TABLE_LIST **tables, uint *counter, uint flags)
return open_tables(thd, tables, counter, flags, &prelocking_strategy);
}
inline TABLE *open_n_lock_single_table(THD *thd, TABLE_LIST *table_l,
thr_lock_type lock_type, uint flags)
{