diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-02-03 11:46:40 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-02-03 11:46:40 +0100 |
| commit | 24e7faa54f72465d57407015ad760cb4a3ad8156 (patch) | |
| tree | edb295de86e4154a630da8a71f71e5f95a6ccbbe /sql | |
| parent | 15f20663dbc9de85f5aee1ce753619bc4a9aed52 (diff) | |
| download | mariadb-git-24e7faa54f72465d57407015ad760cb4a3ad8156.tar.gz | |
Various fixes for Solaris compiler.
Also, restrict symbol visibility in statically
built plugins, to minimize the chance for symbol
name clashes with dynamic plugins.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/opt_subselect.h | 2 | ||||
| -rw-r--r-- | sql/sql_join_cache.h | 2 | ||||
| -rw-r--r-- | sql/sql_select.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sql/opt_subselect.h b/sql/opt_subselect.h index c211fc67c84..7db346f68c1 100644 --- a/sql/opt_subselect.h +++ b/sql/opt_subselect.h @@ -279,7 +279,7 @@ public: }; -void advance_sj_state(JOIN *join, const table_map remaining_tables, uint idx, +extern void advance_sj_state(JOIN *join, table_map remaining_tables, uint idx, double *current_record_count, double *current_read_time, POSITION *loose_scan_pos); void restore_prev_sj_state(const table_map remaining_tables, diff --git a/sql/sql_join_cache.h b/sql/sql_join_cache.h index c153689bb99..155dd64d7e0 100644 --- a/sql/sql_join_cache.h +++ b/sql/sql_join_cache.h @@ -550,7 +550,7 @@ public: BNL_JOIN_ALG, /* Block Nested Loop Join algorithm */ BNLH_JOIN_ALG, /* Block Nested Loop Hash Join algorithm */ BKA_JOIN_ALG, /* Batched Key Access Join algorithm */ - BKAH_JOIN_ALG, /* Batched Key Access with Hash Table Join Algorithm */ + BKAH_JOIN_ALG /* Batched Key Access with Hash Table Join Algorithm */ }; /* diff --git a/sql/sql_select.h b/sql/sql_select.h index 644828fa08c..46e7b7fe95f 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -1688,7 +1688,7 @@ void optimize_wo_join_buffering(JOIN *join, uint first_tab, uint last_tab, double *outer_rec_count, double *reopt_cost); Item_equal *find_item_equal(COND_EQUAL *cond_equal, Field *field, bool *inherited_fl); -bool test_if_ref(COND *root_cond, +extern bool test_if_ref(Item *, Item_field *left_item,Item *right_item); inline bool optimizer_flag(THD *thd, uint flag) |