diff options
| author | Monty <monty@mariadb.org> | 2019-05-02 16:49:47 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2019-05-02 16:49:47 +0300 |
| commit | 0d6fb43e6d6ca1eb9060d7369efcbabcda324f1e (patch) | |
| tree | fe8ff5983db1b3edacc8a2c61533d30b2487ae18 | |
| parent | d46ffaf6afdcfc5b9241d22b176000e9e9936477 (diff) | |
| download | mariadb-git-0d6fb43e6d6ca1eb9060d7369efcbabcda324f1e.tar.gz | |
Fixed some compilation warnings/errors
| -rw-r--r-- | sql/item_sum.cc | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index eb6d71cf99b..4e449198fe0 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -2046,7 +2046,7 @@ double Item_sum_std::val_real() { DBUG_ASSERT(fixed == 1); 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": diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 212ab8e2a13..f0ffa7eae8c 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3043,9 +3043,8 @@ static bool cache_thread(THD *thd) Create new instrumentation for the new THD job, and attach it to this running pthread. */ - PSI_thread *psi= PSI_CALL_new_thread(key_thread_one_connection, - thd, thd->thread_id); - PSI_CALL_set_thread(psi); + PSI_CALL_set_thread(PSI_CALL_new_thread(key_thread_one_connection, + thd, thd->thread_id)); /* reset abort flag for the thread */ thd->mysys_var->abort= 0; |