diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-12-19 19:15:51 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-12-19 19:15:51 -0800 |
| commit | f6636852c4254f3c5e9272ccb0297f204ab56df3 (patch) | |
| tree | bb1caccbf3d1d10fde92a9fbfd4ff112a7ef682d /sql/sql_base.h | |
| parent | 490d2a42670deac197af80977c1f1b0f3e0ff2ad (diff) | |
| parent | 1b62f0f58c7c5219143b6a87b89b1fa15e2be401 (diff) | |
| download | mariadb-git-f6636852c4254f3c5e9272ccb0297f204ab56df3.tar.gz | |
Merge mwl248->10.0-base.
Diffstat (limited to 'sql/sql_base.h')
| -rw-r--r-- | sql/sql_base.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sql/sql_base.h b/sql/sql_base.h index af63aefa7f9..c19e9c68132 100644 --- a/sql/sql_base.h +++ b/sql/sql_base.h @@ -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) { |