From c68cb788ccddc35b463c8bfb160e4711a21cca1c Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Tue, 11 Jun 2019 13:21:17 +0300 Subject: [PATCH 1/2] MXS-2552 Update DISK plugin documentation --- Documentation/Getting-Started/Configuration-Guide.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/Getting-Started/Configuration-Guide.md b/Documentation/Getting-Started/Configuration-Guide.md index b6ef39eea..19e173778 100644 --- a/Documentation/Getting-Started/Configuration-Guide.md +++ b/Documentation/Getting-Started/Configuration-Guide.md @@ -1571,6 +1571,9 @@ logging warnings or take other actions (e.g. perform a switchover). This functionality will only work with MariaDB server versions 10.1.32, 10.2.14 and 10.3.6 onwards, if the `DISKS` _information schema plugin_ has been installed. +**NOTE**: In future MariaDB versions, the information will be available _only_ if +the monitor user has the `FILE` privilege. + A limit is specified as a path followed by a colon and a percentage specifying how full the corresponding disk may be, before action is taken. E.g. an entry like ``` From acc5863fe206c9daa1b15b17036f31214c923afb Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Tue, 11 Jun 2019 12:56:16 +0300 Subject: [PATCH 2/2] MXS-2442 ':N' accepted as pos. parameter in Oracle mode --- query_classifier/qc_sqlite/qc_sqlite.cc | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/query_classifier/qc_sqlite/qc_sqlite.cc b/query_classifier/qc_sqlite/qc_sqlite.cc index 5d09b5f45..20271885c 100644 --- a/query_classifier/qc_sqlite/qc_sqlite.cc +++ b/query_classifier/qc_sqlite/qc_sqlite.cc @@ -878,9 +878,18 @@ public: } } } - else if (zToken[0] != '?') + else { - MXS_WARNING("%s reported as VARIABLE.", zToken); + // '?' is always accepted as a positional parameter. + if (zToken[0] != '?') + { + // If the mode is Oracle then :N is accepted as well. + if (zToken[0] != ':' || this_thread.sql_mode != QC_SQL_MODE_ORACLE) + { + // Everything else is unexpected, but harmless. + MXS_WARNING("%s reported as VARIABLE.", zToken); + } + } } } break;