File tree Expand file tree Collapse file tree 2 files changed +3
-4
lines changed Expand file tree Collapse file tree 2 files changed +3
-4
lines changed Original file line number Diff line number Diff line change @@ -2046,7 +2046,7 @@ double Item_sum_std::val_real()
2046
2046
{
2047
2047
DBUG_ASSERT (fixed == 1 );
2048
2048
double nr= Item_sum_variance::val_real ();
2049
- if (isnan (nr))
2049
+ if (std:: isnan (nr))
2050
2050
{
2051
2051
/*
2052
2052
variance_fp_recurrence_next() can overflow in some cases and return "nan":
Original file line number Diff line number Diff line change @@ -3043,9 +3043,8 @@ static bool cache_thread(THD *thd)
3043
3043
Create new instrumentation for the new THD job,
3044
3044
and attach it to this running pthread.
3045
3045
*/
3046
- PSI_thread *psi= PSI_CALL_new_thread (key_thread_one_connection,
3047
- thd, thd->thread_id );
3048
- PSI_CALL_set_thread (psi);
3046
+ PSI_CALL_set_thread (PSI_CALL_new_thread (key_thread_one_connection,
3047
+ thd, thd->thread_id ));
3049
3048
3050
3049
/* reset abort flag for the thread */
3051
3050
thd->mysys_var ->abort = 0 ;
You can’t perform that action at this time.
0 commit comments