hcq/MaxScale
hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.3' into develop

Browse Source
This commit is contained in:
Johan Wikman 2019-06-11 13:54:51 +03:00
commit 1e3da20409
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/Getting-Started/Configuration-Guide.md
View File

@ -1698,6 +1698,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
```

13
query_classifier/qc_sqlite/qc_sqlite.cc
View File

@ -889,9 +889,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;