mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix warnings

Browse source
This commit is contained in:
Vladislav Vaintroub 2018-01-06 22:11:42 +00:00
parent fa7d85bb87
commit 7a01e64c3a
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sql/opt_split.cc
View file

@ -874,7 +874,7 @@ SplM_plan_info * JOIN_TAB::choose_best_splitting(double record_count,
*/ */
for (uint tablenr= 0; tablenr < join->table_count; tablenr++) for (uint tablenr= 0; tablenr < join->table_count; tablenr++)
{ {
if (!((1 << tablenr) & tables_usable_for_splitting)) if (!((1ULL << tablenr) & tables_usable_for_splitting))
continue; continue;
JOIN_TAB *tab= join->map2table[tablenr]; JOIN_TAB *tab= join->map2table[tablenr];
TABLE *table= tab->table; 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 */ /* 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; spl_plan= spl_opt_info->last_plan;
if (spl_plan) if (spl_plan)
{ {

2
strings/dtoa.c
View file

@ -1290,7 +1290,7 @@ static double ratio(Bigint *a, Bigint *b)
dval(&db)= b2d(b, &kb); dval(&db)= b2d(b, &kb);
k= ka - kb + 32*(a->wds - b->wds); k= ka - kb + 32*(a->wds - b->wds);
if (k > 0) if (k > 0)
word0(&da)+= k*Exp_msk1 * 1.0; word0(&da)+= (ULong)(k*Exp_msk1 * 1.0);
else else
{ {
k= -k; k= -k;