mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
6860a4b556
This is essentially a backport of the 10.0
commit 203f4d4193
that fixes a bug and silences a GCC 6.3.0 warning
about a left shift of a signed integer.
Missing parenthesis in a macro definition caused wrong operation
in the Query_cache::send_result_to_client() statement
thd->query_plan_flags= (thd->query_plan_flags & ~QPLAN_QC_NO) | QPLAN_QC;
This would expand to
thd->query_plan_flags= (thd->query_plan_flags & ~1) << 6 | 1 << 5;
which would shift the flags by 6 and clear an unrelated flag, instead
of clearing the flag (1 << 6).
34 lines
1.4 KiB
C
34 lines
1.4 KiB
C
/* Copyright (C) 2009, 2017, MariaDB Corporation.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 or later of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/* Defining what to log to slow log */
|
|
|
|
#define LOG_SLOW_VERBOSITY_INIT 0
|
|
#define LOG_SLOW_VERBOSITY_INNODB (1U << 0)
|
|
#define LOG_SLOW_VERBOSITY_QUERY_PLAN (1U << 1)
|
|
|
|
#define QPLAN_INIT QPLAN_QC_NO
|
|
|
|
#define QPLAN_ADMIN (1U << 0)
|
|
#define QPLAN_FILESORT (1U << 1)
|
|
#define QPLAN_FILESORT_DISK (1U << 2)
|
|
#define QPLAN_FULL_JOIN (1U << 3)
|
|
#define QPLAN_FULL_SCAN (1U << 4)
|
|
#define QPLAN_QC (1U << 5)
|
|
#define QPLAN_QC_NO (1U << 6)
|
|
#define QPLAN_TMP_DISK (1U << 7)
|
|
#define QPLAN_TMP_TABLE (1U << 8)
|
|
/* ... */
|
|
#define QPLAN_MAX (1U << 31) /* reserved as placeholder */
|