diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-01-06 22:11:42 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-01-06 22:11:42 +0000 |
| commit | 7a01e64c3a94c8bcf7a4fd50c070f8801f094649 (patch) | |
| tree | d502ce99e1ef64970360098ce9957f418fbe4b87 /sql/opt_split.cc | |
| parent | fa7d85bb87e796f1cf77fdf79f2b2d6ece423baf (diff) | |
| download | mariadb-git-7a01e64c3a94c8bcf7a4fd50c070f8801f094649.tar.gz | |
Fix warnings
Diffstat (limited to 'sql/opt_split.cc')
| -rw-r--r-- | sql/opt_split.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/opt_split.cc b/sql/opt_split.cc index 8c67cc94a60..4d71e9cdd1b 100644 --- a/sql/opt_split.cc +++ b/sql/opt_split.cc @@ -874,7 +874,7 @@ SplM_plan_info * JOIN_TAB::choose_best_splitting(double record_count, */ for (uint tablenr= 0; tablenr < join->table_count; tablenr++) { - if (!((1 << tablenr) & tables_usable_for_splitting)) + if (!((1ULL << tablenr) & tables_usable_for_splitting)) continue; JOIN_TAB *tab= join->map2table[tablenr]; TABLE *table= tab->table; @@ -978,7 +978,7 @@ SplM_plan_info * JOIN_TAB::choose_best_splitting(double record_count, } /* Set the cost of the preferred materialization for this partial join */ - records= spl_opt_info->unsplit_card; + records= (ha_rows)spl_opt_info->unsplit_card; spl_plan= spl_opt_info->last_plan; if (spl_plan) { |