1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed some compilation warnings/errors

Browse Source
This commit is contained in:
Monty 2019-05-02 16:49:47 +03:00
parent d46ffaf6af
commit 0d6fb43e6d
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/item_sum.cc
View File

@ -2046,7 +2046,7 @@ double Item_sum_std::val_real()
{ {
DBUG_ASSERT(fixed == 1); DBUG_ASSERT(fixed == 1);
double nr= Item_sum_variance::val_real(); double nr= Item_sum_variance::val_real();
if (isnan(nr)) if (std::isnan(nr))
{ {
/* /*
variance_fp_recurrence_next() can overflow in some cases and return "nan": variance_fp_recurrence_next() can overflow in some cases and return "nan":

5
sql/mysqld.cc
View File

@ -3043,9 +3043,8 @@ static bool cache_thread(THD *thd)
Create new instrumentation for the new THD job, Create new instrumentation for the new THD job,
and attach it to this running pthread. and attach it to this running pthread.
*/ */
PSI_thread *psi= PSI_CALL_new_thread(key_thread_one_connection, PSI_CALL_set_thread(PSI_CALL_new_thread(key_thread_one_connection,
thd, thd->thread_id); thd, thd->thread_id));
PSI_CALL_set_thread(psi);
/* reset abort flag for the thread */ /* reset abort flag for the thread */
thd->mysys_var->abort= 0; thd->mysys_var->abort= 0;