Skip to content

Commit 0d6fb43

Browse files
committed
Fixed some compilation warnings/errors
1 parent d46ffaf commit 0d6fb43

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

sql/item_sum.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2046,7 +2046,7 @@ double Item_sum_std::val_real()
20462046
{
20472047
DBUG_ASSERT(fixed == 1);
20482048
double nr= Item_sum_variance::val_real();
2049-
if (isnan(nr))
2049+
if (std::isnan(nr))
20502050
{
20512051
/*
20522052
variance_fp_recurrence_next() can overflow in some cases and return "nan":

sql/mysqld.cc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3043,9 +3043,8 @@ static bool cache_thread(THD *thd)
30433043
Create new instrumentation for the new THD job,
30443044
and attach it to this running pthread.
30453045
*/
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));
30493048

30503049
/* reset abort flag for the thread */
30513050
thd->mysys_var->abort= 0;

0 commit comments

Comments
 (0)