From 44f6d23a9052494f9663866036dbbc1be52bf90e Mon Sep 17 00:00:00 2001
From: Tom Sellers <tom@fadedcode.net>
Date: Sun, 15 Feb 2015 07:44:47 -0600
Subject: [PATCH 01/14] Rebasing against current Recog master branch from
 Rapid7

---
 xml/mysql_banners.xml | 668 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 668 insertions(+)
 create mode 100644 xml/mysql_banners.xml

diff --git a/xml/mysql_banners.xml b/xml/mysql_banners.xml
new file mode 100644
index 00000000..43de6fa1
--- /dev/null
+++ b/xml/mysql_banners.xml
@@ -0,0 +1,668 @@
+<?xml version="1.0"?>
+<!--
+  References:  
+  Error codes:  http://dev.mysql.com/doc/refman/5.5/en/error-messages-server.html
+-->
+
+
+<fingerprints>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}(?:-\d{1,2})?)(?:-m\d)?(?:-rc)?(?:-alpha)?(?:-beta)?(?:-gamma)?(?:-?[Mm]ax)?(?:-modified)?(?:-debug)?(?:-log)?$">
+      <example>4.1.20</example>
+      <example>5.5.23-55</example>
+      <example>5.1.65-log</example>
+      <example>5.4.1-beta-log</example>
+      <example>4.1.13-Max-log</example>
+      <example>5.1.33max-log</example>
+      <example>5.0.87-modified-log</example>
+      <example>5.5.3-m3-log</example>
+      <example>4.0.20a-debug</example>
+      <example>5.1.37-debug-log</example>
+      <description>Oracle MySQL</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:-alpha)?(?:-beta)?(?:-rc)?-community(?:-max)?-nt(?:-log)?(?:-debug)?(?:-log)?$">
+      <example>4.1.22-community-max-nt</example>
+      <example>5.0.88-community-nt</example>
+      <example>5.0.67-community-nt-log</example>
+      <example>5.1.20-beta-community-nt-debug</example>
+      <example>6.0.0-alpha-community-nt-debug</example>
+      <example>6.0.2-alpha-community-nt-debug-log </example>
+      <description>Oracle MySQL Community Edition with Named Pipes (Windows)</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL Community Edition"/>
+      <param pos="0" name="os.vendor" value="Microsoft"/>
+      <param pos="0" name="os.device" value="General"/>
+      <param pos="0" name="os.family" value="Windows"/>
+      <param pos="0" name="os.product" value="Windows"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:-m\d)?(?:-rc)?(?:-alpha)?(?:-beta)?-[Cc]ommunity(?:-max)?(?:-debug)?(?:-log)?(?:-debug)?$">
+      <example>5.0.95-community-log</example>
+      <example>5.0.37-Community-log</example>
+      <example>5.0.21-community-max</example>
+      <example>5.5.0-m2-community-log</example>
+      <example>6.0.4-alpha-community</example>
+      <example>5.1.33-community-debug</example>
+      <example>5.5.0-m2-community-debug-log</example>
+      <description>Oracle MySQL Community Edition</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL Community Edition"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:-alpha)?(?:-beta)?(?:-rc)?(?:-gamma)?(?:-max)?-nt(?:-max)?(?:-log)?$">
+      <example>5.0.18-nt</example>
+      <example>4.1.12a-nt-max-log</example>
+      <example>3.23.58-max-nt</example>
+      <example>5.1.6-alpha-nt-max</example>
+      <example>4.0.11-gamma-max-nt</example>
+      <description>Oracle MySQL with Named Pipes (Windows)</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="os.vendor" value="Microsoft"/>
+      <param pos="0" name="os.device" value="General"/>
+      <param pos="0" name="os.family" value="Windows"/>
+      <param pos="0" name="os.product" value="Windows"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-cll$">
+      <example>5.5.25a-cll</example>
+      <description>Oracle MySQL hosted on CPanel</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="os.device" value="General"/>
+      <param pos="0" name="os.family" value="Linux"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-community-cll$">
+      <example>5.0.91-community-cll</example>
+      <description>Oracle MySQL Community hosted on CPanel</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL Community Edition"/>
+      <param pos="0" name="os.device" value="General"/>
+      <param pos="0" name="os.family" value="Linux"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-cll-lve$">
+      <example>5.1.66-cll-lve</example>
+      <description>Oracle MySQL on CloudLinux in a Lightweight Virtual Environment (LVE)</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="os.vendor" value="CloudLinux"/>
+      <param pos="0" name="os.device" value="General"/>
+      <param pos="0" name="os.family" value="Linux"/>
+      <param pos="0" name="os.product" value="Linux"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-community-cll-lve$">
+      <example>5.0.95-community-cll-lve</example>
+      <description>Oracle MySQL Community on CloudLinux in a Lightweight Virtual Environment (LVE)</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL Community Edition"/>
+      <param pos="0" name="os.vendor" value="CloudLinux"/>
+      <param pos="0" name="os.device" value="General"/>
+      <param pos="0" name="os.family" value="Linux"/>
+      <param pos="0" name="os.product" value="Linux"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})-0ubuntu0.(\d\d\.\d\d)">
+      <example>5.1.66-0ubuntu0.10.04.3-log</example>
+      <example>5.5.28-0ubuntu0.12.04.3-log</example>
+      <description>Oracle MySQL on Ubuntu</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="os.vendor" value="Ubuntu"/>
+      <param pos="0" name="os.device" value="General"/>
+      <param pos="0" name="os.family" value="Linux"/>
+      <param pos="0" name="os.product" value="Linux"/>
+      <param pos="2" name="os.version"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})-(?:Debian_)?\dubuntu(\d{1,2}\.\d\d)">
+      <example>5.0.22-Debian_0ubuntu6.06.14-log</example>
+      <example>5.1.41-3ubuntu12.10</example>
+      <description>Oracle MySQL on Ubuntu</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="os.vendor" value="Ubuntu"/>
+      <param pos="0" name="os.device" value="General"/>
+      <param pos="0" name="os.family" value="Linux"/>
+      <param pos="0" name="os.product" value="Linux"/>
+      <param pos="2" name="os.version"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})[-_](?:Ubuntu[_-])?(?:Debian[_-])?\d{1,2}ubuntu\d{1,2}(?:\.\d)?(?:-log)?$">
+      <example>5.0.45-Debian_1ubuntu3.4</example> 
+      <example>5.0.51a-3ubuntu5.5</example>
+      <example>5.0.51a-3ubuntu5.8-log</example>
+      <example>5.0.75-0ubuntu10.2</example>
+      <example>5.1.58-1ubuntu1</example>
+      <example>4.0.24_Debian-10ubuntu2-log</example>
+      <example>4.0.24_Debian-10ubuntu2-log</example>
+      <description>Oracle MySQL on Ubuntu where trailing digits aren't OS version</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="os.vendor" value="Ubuntu"/>
+      <param pos="0" name="os.device" value="General"/>
+      <param pos="0" name="os.family" value="Linux"/>
+      <param pos="0" name="os.product" value="Linux"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.[^+]+)\+squeeze">
+      <example>5.1.66-0+squeeze1</example>
+      <example>5.1.66-0+squeeze1-log </example>
+      <description>Oracle MySQL on Debian 6.0 (squeeze)</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="os.vendor" value="Debian"/>
+      <param pos="0" name="os.device" value="General"/>
+      <param pos="0" name="os.family" value="Linux"/>
+      <param pos="0" name="os.product" value="Linux"/>
+      <param pos="0" name="os.version" value="6.0"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.[^+]+)\+lenny">
+      <example>5.0.51a-24+lenny1-log</example>
+      <example>5.0.51a-24+lenny2</example>
+      <description>Oracle MySQL on Debian 5.0 (lenny)</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="os.vendor" value="Debian"/>
+      <param pos="0" name="os.device" value="General"/>
+      <param pos="0" name="os.family" value="Linux"/>
+      <param pos="0" name="os.product" value="Linux"/>
+      <param pos="0" name="os.version" value="5.0"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-\d~bpo50">
+      <example>5.1.49-3~bpo50+1-log</example>
+      <description>Oracle MySQL Backport on Debian 5.0 (lenny)</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="os.vendor" value="Debian"/>
+      <param pos="0" name="os.device" value="General"/>
+      <param pos="0" name="os.family" value="Linux"/>
+      <param pos="0" name="os.product" value="Linux"/>
+      <param pos="0" name="os.version" value="5.0"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-Debian_\d~?bpo\.?\d">
+      <example>5.0.22-Debian_2bpo1</example>
+      <example>5.0.32-Debian_7~bpo.1-log</example>
+      <description>Oracle MySQL Backport on Debian</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="os.vendor" value="Debian"/>
+      <param pos="0" name="os.device" value="General"/>
+      <param pos="0" name="os.family" value="Linux"/>
+      <param pos="0" name="os.product" value="Linux"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})-Debian_\d?etch\d">
+      <example>4.1.11-Debian_etch1-log</example>
+      <example>5.0.32-Debian_7etch6-log</example>
+      <description>Oracle MySQL on Debian 4.0 (etch)</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="os.vendor" value="Debian"/>
+      <param pos="0" name="os.device" value="General"/>
+      <param pos="0" name="os.family" value="Linux"/>
+      <param pos="0" name="os.product" value="Linux"/>
+      <param pos="0" name="os.version" value="4.0"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})[_-]Debian[_-]\d{1,2}sarge\d">
+      <example>4.0.24_Debian-10sarge2-log</example>
+      <example>4.1.11-Debian_4sarge7-log</example>
+      <description>Oracle MySQL on Debian 3.1 (sarge)</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="os.vendor" value="Debian"/>
+      <param pos="0" name="os.device" value="General"/>
+      <param pos="0" name="os.family" value="Linux"/>
+      <param pos="0" name="os.product" value="Linux"/>
+      <param pos="0" name="os.version" value="3.1"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:[_-]\d{8})?[_-]Debian[_-]\d{1,2}(?:-log)?$">
+      <example>4.0.23_Debian-3-log</example>
+      <example>4.0.31-20070605_Debian-7-log</example>
+      <description>Oracle MySQL on Debian (Generic match)</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="os.vendor" value="Debian"/>
+      <param pos="0" name="os.device" value="General"/>
+      <param pos="0" name="os.family" value="Linux"/>
+      <param pos="0" name="os.product" value="Linux"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})(?:-rc)?[_-]Debian[_-]\d{1,2}~ppa\d(?:-log)?$">
+      <example>5.1.22-rc-Debian_2~ppa5-log</example>
+      <description>Oracle MySQL on Debian (Generic match) using PPA</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="os.vendor" value="Debian"/>
+      <param pos="0" name="os.device" value="General"/>
+      <param pos="0" name="os.family" value="Linux"/>
+      <param pos="0" name="os.product" value="Linux"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}(?:-\d{1,2})?)(?:-Debian)?(?:-Dotdeb)?[-~_\d\.]+dotdeb\.\d(?:-log)?$">
+      <example>5.1.54-0.dotdeb.0</example>
+      <example>5.1.58-1~dotdeb.0</example>
+      <example>5.5.30-1~dotdeb.0-log</example>
+      <example>5.1.30-Dotdeb_0.dotdeb.0-log</example>
+      <description>Oracle MySQL packaged by DotDeb.org</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="os.vendor" value="Debian"/>
+      <param pos="0" name="os.device" value="General"/>
+      <param pos="0" name="os.family" value="Linux"/>
+      <param pos="0" name="os.product" value="Linux"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:-alpha)?(?:-beta)?(?:-gamma)?(?:-rc)?-standard(?:-log)?$">
+      <example>5.0.13-rc-standard-log</example>
+      <example>5.0.37-standard</example>
+      <example>5.0.51a-standard-log</example>
+      <description>Oracle MySQL Standard Edition</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL Standard Edition"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-pro(?:-gpl)?-nt(?:-log)?$">
+      <example>5.0.24-pro-nt</example>
+      <example>4.1.25-pro-gpl-nt-log</example>
+      <description>Oracle MySQL Commercial Edition with Named Pipes (Windows)</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL Commercial Edition"/>
+      <param pos="0" name="os.vendor" value="Microsoft"/>
+      <param pos="0" name="os.device" value="General"/>
+      <param pos="0" name="os.family" value="Windows"/>
+      <param pos="0" name="os.product" value="Windows"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-pro(?:-gpl)?(?:-log)?">
+      <example>4.1.23-pro-gpl-log</example>
+      <example>5.0.17c-pro-gpl-cert</example>
+      <description>Oracle MySQL Commercial Edition</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL Commercial Edition"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}sp1)">
+      <example>5.0.82sp1</example>
+      <example>5.1.46sp1-enterprise-gpl-advanced-log</example>
+      <description>Oracle MySQL Enterprise Edition</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL Enterprise Edition"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-enterprise-nt">
+      <example>5.0.84-enterprise-nt</example>
+      <description>Oracle MySQL Enterprise Edition with Named Pipes (Windows)</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL Enterprise Edition"/>
+      <param pos="0" name="os.vendor" value="Microsoft"/>
+      <param pos="0" name="os.device" value="General"/>
+      <param pos="0" name="os.family" value="Windows"/>
+      <param pos="0" name="os.product" value="Windows"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:-rc)?-enterprise">
+      <example>5.1.26-rc-enterprise-gpl-log</example>
+      <example>5.5.27-enterprise-commercial-advanced-log</example>
+      <description>Oracle MySQL Enterprise Edition</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL Enterprise Edition"/>
+   </fingerprint>
+
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}-ndb-\d\.\d{1,2}\.\h{1,3})">
+      <example>5.1.30-ndb-6.3.20-cluster-gpl-log</example>
+      <example>5.5.20-ndb-7.2.5-gpl</example>
+      <description>Oracle MySQL Cluster Edition</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL Cluster Edition"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-CLUSTERS?(?:-log)?$" flags="REG_ICASE">
+      <example>4.1.21-CLUSTERS</example>
+      <example>5.0.46-cluster</example>
+      <description>Oracle MySQL Cluster Edition</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL Cluster Edition"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-classic(?:-log)?">
+      <example>5.0.86-classic-log</example>
+      <description>Oracle MySQL Classic Edition</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL Classic Edition"/>
+   </fingerprint>
+
+   <!-- Linux only - http://www.percona.com/services/mysql-support/supported-platforms -->
+   <!-- Build list - http://www.percona.com/doc/percona-server/5.1/release-notes/release-notes_index.html -->
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}-?rel\d\d\.\d)(?:-log)?">
+      <example>5.1.57-rel12.8</example>
+      <example>5.1.60rel13.1-log</example>
+      <example>5.1.67-rel14.3-log</example>
+      <description>Percona Server (MySQL fork)</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Percona"/>
+      <param pos="0" name="service.family" value="Percona"/>
+      <param pos="0" name="service.product" value="Percona Server"/>
+      <param pos="0" name="os.device" value="General"/>
+      <param pos="0" name="os.family" value="Linux"/>
+      <param pos="0" name="os.product" value="Linux"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}-\d\d\.\d)">
+      <example>5.5.28-29.3-log</example>
+      <description>Percona Server (MySQL fork)</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Percona"/>
+      <param pos="0" name="service.family" value="Percona"/>
+      <param pos="0" name="service.product" value="Percona Server"/>
+      <param pos="0" name="os.device" value="General"/>
+      <param pos="0" name="os.family" value="Linux"/>
+      <param pos="0" name="os.product" value="Linux"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-(?:rc)?[Pp]ercona">
+      <example>5.1.50-percona</example>      
+      <example>5.5.27-percona-sure1-log</example>
+      <example>5.5.7-rcPercona-Server-log</example>
+      <description>Percona Server (MySQL fork)</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Percona"/>
+      <param pos="0" name="service.family" value="Percona"/>
+      <param pos="0" name="service.product" value="Percona Server"/>
+      <param pos="0" name="os.device" value="General"/>
+      <param pos="0" name="os.family" value="Linux"/>
+      <param pos="0" name="os.product" value="Linux"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-nmm">
+      <example>4.0.27-nmm1-log</example>
+      <example>4.1.22-nmm-1-log</example>
+      <description>Oracle MySQL</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-nightly-\d{8}(?:-log)?$">
+      <example>3.23.59-nightly-20050301-log</example>
+      <description>Oracle MySQL nightly build</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-SERVER">
+      <example>5.1.30-SERVER-104</example>
+      <description>Oracle MySQL</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-ISPrime">
+      <example>4.0.15a-ISPrime</example>
+      <description>Oracle MySQL</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-rc-\d\.\d{1,2}\.\h{1,3}">
+      <example>5.1.26-rc-5.1.26rc-log</example>
+      <description>Oracle MySQL possibly Debian specific</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-ius(?:-log)?$">
+      <example>5.1.66-ius-log</example>
+      <description>Oracle MySQL packaged for RHEL/CentOS by IUS</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="os.device" value="General"/>
+      <param pos="0" name="os.family" value="Linux"/>
+      <param pos="0" name="os.product" value="Linux"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})[\.-]d\d{1,2}-ourdelta\d{0,2}(?:-log)?$">
+      <example>5.0.67.d7-ourdelta-log</example>
+      <example>5.0.87-d10-ourdelta65-log</example>
+      <description>Oracle MySQL tweaked and packaged by OurDelta</description>
+      <!-- They also have a MariaDB based one based on 5.1 -->
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="os.device" value="General"/>
+      <param pos="0" name="os.family" value="Linux"/>
+      <param pos="0" name="os.product" value="Linux"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-Alibaba-\d{6}(?:-log)?$">
+      <example>5.1.61-Alibaba-120201-log</example>
+      <example>5.1.61-Alibaba-121011-log</example>
+      <description>Oracle MySQL Alibaba build? distro? Aliyun.com hosted?</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-MariaDB.+~lenny(?:-log)?$">
+      <example>5.3.2-MariaDB-beta-mariadb102~lenny</example>
+      <description>MariaDB MariaDB on Debian Lenny</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="MariaDB"/>
+      <param pos="0" name="service.family" value="MariaDB"/>
+      <param pos="0" name="service.product" value="MariaDB"/>
+      <param pos="0" name="os.vendor" value="Debian"/>
+      <param pos="0" name="os.device" value="General"/>
+      <param pos="0" name="os.family" value="Linux"/>
+      <param pos="0" name="os.product" value="Linux"/>
+      <param pos="0" name="os.version" value="5.0"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-[Mm]aria">
+      <example>5.1.39-maria-beta</example>
+      <example>5.5.24-MariaDB-mariadb1~0.1</example>
+      <description>MariaDB MariaDB</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="MariaDB"/>
+      <param pos="0" name="service.family" value="MariaDB"/>
+      <param pos="0" name="service.product" value="MariaDB"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-falcon-alpha-community-nt">
+      <example>5.2.0-falcon-alpha-community-nt</example>
+      <description>Oracle MySQL with defunct Falcon Storage Engine</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="os.vendor" value="Microsoft"/>
+      <param pos="0" name="os.device" value="General"/>
+      <param pos="0" name="os.family" value="Windows"/>
+      <param pos="0" name="os.product" value="Windows"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-tokudb-.*MariaDB(?:-log)?$">
+      <example>5.5.25-tokudb-6.1.1-47477-MariaDB-log</example>
+      <description>Tokutek customized MariaDB</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Tokutek"/>
+      <param pos="0" name="service.family" value="MariaDB"/>
+      <param pos="0" name="service.product" value="MariaDB"/>
+   </fingerprint>
+
+   <fingerprint pattern="^^(\d\.\d{1,2}\.\h{1,3})-Sphinx">
+      <example>5.1.40-Sphinx</example>
+      <description>Oracle MySQL with the Sphinx full text search engine</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:[^+]+)?\+tld\d">
+      <example>5.0.91+tld0-log</example>
+      <example>5.1.57-5.1.57+tld2-log</example>
+      <description>Oracle MySQL packaged by TLD Linux</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="os.vendor" value="TLD"/>
+      <param pos="0" name="os.device" value="General"/>
+      <param pos="0" name="os.family" value="Linux"/>
+      <param pos="0" name="os.product" value="Linux"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-Debian_\d\.infrant\d$">
+      <example>5.0.24a-Debian_3.infrant1</example>
+      <description>Oracle MySQL on a Netgear ReadyNAS</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="os.vendor" value="Debian"/>
+      <param pos="0" name="os.device" value="General"/>
+      <param pos="0" name="os.family" value="Linux"/>
+      <param pos="0" name="os.product" value="Linux"/>
+      <param pos="0" name="hw.vendor" value="Netgear"/>
+      <param pos="0" name="hw.device" value="General"/>
+      <param pos="0" name="hw.family" value="ReadyNAS"/>
+      <param pos="0" name="hw.product" value="ReadyNAS"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-beget(?:-log)?$">
+      <example>5.1.61-beget-log</example>
+      <description>Oracle MySQL at Ukrainian hoster BeGet(?)</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-(?:Linuxtone.Org|LTOPS)(?:-log)?$">
+      <example>5.0.56-Linuxtone.Org</example>
+      <example>5.1.53-LTOPS-log</example>
+      <description>Oracle MySQL at Chinese hoster Linuxtone.org</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-xencdn.net(?:-log)?$">
+      <example>5.1.66-xencdn.net-log</example>
+      <description>Oracle MySQL at Chinese hoster Xencdn.net</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-Comsenz(?:-log)?$">
+      <example>5.0.27-Comsenz-log</example>
+      <description>Oracle MySQL at Chinese hoster Comsenz</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})yes(?:-log)?$">
+      <example>4.0.27yes</example>
+      <description>Oracle MySQL part of KB2 / Kimsboard (Korean site mgmt)?</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})\.t\d{1,2}(?:-log)?$">
+      <example>5.5.24.t7-log</example>
+      <description>Oracle MySQL audited/published by Twitter</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+   </fingerprint>
+</fingerprints>

From 3e2c4a9920d561e98575f5814eecf938325a7b18 Mon Sep 17 00:00:00 2001
From: Tom Sellers <tom@fadedcode.net>
Date: Sun, 15 Feb 2015 16:57:12 -0600
Subject: [PATCH 02/14] Multiple updates to mysql_banners

- Moved editions to service.edition
- Changed how Percona and MariaDB are labeled
- Added/tweaked fingerprints
- Added fingerprints for errors
- Started the process of adding example matches
---
 xml/mysql_banners.xml | 127 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 105 insertions(+), 22 deletions(-)

diff --git a/xml/mysql_banners.xml b/xml/mysql_banners.xml
index 43de6fa1..efce688f 100644
--- a/xml/mysql_banners.xml
+++ b/xml/mysql_banners.xml
@@ -36,7 +36,8 @@
       <param pos="1" name="service.version"/>
       <param pos="0" name="service.vendor" value="Oracle"/>
       <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL Community Edition"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="service.edition" value="Community Edition"/>
       <param pos="0" name="os.vendor" value="Microsoft"/>
       <param pos="0" name="os.device" value="General"/>
       <param pos="0" name="os.family" value="Windows"/>
@@ -55,7 +56,8 @@
       <param pos="1" name="service.version"/>
       <param pos="0" name="service.vendor" value="Oracle"/>
       <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL Community Edition"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="service.edition" value="Community Edition"/>
    </fingerprint>
 
    <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:-alpha)?(?:-beta)?(?:-rc)?(?:-gamma)?(?:-max)?-nt(?:-max)?(?:-log)?$">
@@ -92,7 +94,8 @@
       <param pos="1" name="service.version"/>
       <param pos="0" name="service.vendor" value="Oracle"/>
       <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL Community Edition"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="service.edition" value="Community Edition"/>
       <param pos="0" name="os.device" value="General"/>
       <param pos="0" name="os.family" value="Linux"/>
    </fingerprint>
@@ -116,7 +119,8 @@
       <param pos="1" name="service.version"/>
       <param pos="0" name="service.vendor" value="Oracle"/>
       <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL Community Edition"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="service.edition" value="Community Edition"/>
       <param pos="0" name="os.vendor" value="CloudLinux"/>
       <param pos="0" name="os.device" value="General"/>
       <param pos="0" name="os.family" value="Linux"/>
@@ -172,9 +176,43 @@
       <param pos="0" name="os.product" value="Linux"/>
    </fingerprint>
 
-   <fingerprint pattern="^(\d\.\d{1,2}\.[^+]+)\+squeeze">
-      <example>5.1.66-0+squeeze1</example>
-      <example>5.1.66-0+squeeze1-log </example>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.[^+]+)\+deb\.sury\.org~precise\+\d(?:-log)?$">
+      <example service.version="5.6.19-1">5.6.19-1+deb.sury.org~precise+1</example>
+      <example service.version="5.6.20-1">5.6.20-1+deb.sury.org~precise+1-log</example>
+      <description>Oracle MySQL on Ubuntu 12.04 (Precise Pangolin) packaged by deb.sury.org</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="os.vendor" value="Ubuntu"/>
+      <param pos="0" name="os.device" value="General"/>
+      <param pos="0" name="os.family" value="Linux"/>
+      <param pos="0" name="os.product" value="Linux"/>
+      <param pos="0" name="os.version" value="12.04"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.[^+]+)\+deb\.sury\.org~trusty\+\d(?:-log)?$">
+      <example service.version="5.6.21-1">5.6.21-1+deb.sury.org~trusty+1</example>
+      <example service.version="5.6.19-1">5.6.19-1+deb.sury.org~trusty+1-log</example>
+      <description>Oracle MySQL on Ubuntu 14.04 (Trusty Tahr) packaged by deb.sury.org</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="os.vendor" value="Ubuntu"/>
+      <param pos="0" name="os.device" value="General"/>
+      <param pos="0" name="os.family" value="Linux"/>
+      <param pos="0" name="os.product" value="Linux"/>
+      <param pos="0" name="os.version" value="14.04"/>
+   </fingerprint>
+
+
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.[^+]+)\+(?:squeeze\d|deb6u1)(?:-log)?$">
+      <example service.version="5.1.66-0">5.1.66-0+squeeze1</example>
+      <example service.version="5.1.66-0">5.1.66-0+squeeze1-log</example>
+      <example service.version="5.1.73-1">5.1.73-1+deb6u1</example>
       <description>Oracle MySQL on Debian 6.0 (squeeze)</description>
       <param pos="1" name="service.version"/>
       <param pos="0" name="service.vendor" value="Oracle"/>
@@ -187,6 +225,26 @@
       <param pos="0" name="os.version" value="6.0"/>
    </fingerprint>
 
+
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.[^+]+)\+wheezy\d(?:-log)?$">
+      <example service.version="5.5.41-0">5.5.41-0+wheezy1</example>
+      <example service.version="5.5.35-0">5.5.35-0+wheezy1-log</example>
+      <description>Oracle MySQL on Debian 7.0 (wheezy)</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="os.vendor" value="Debian"/>
+      <param pos="0" name="os.device" value="General"/>
+      <param pos="0" name="os.family" value="Linux"/>
+      <param pos="0" name="os.product" value="Linux"/>
+      <param pos="0" name="os.version" value="7.0"/>
+   </fingerprint>
+
+
+
+
    <fingerprint pattern="^(\d\.\d{1,2}\.[^+]+)\+lenny">
       <example>5.0.51a-24+lenny1-log</example>
       <example>5.0.51a-24+lenny2</example>
@@ -260,6 +318,22 @@
       <param pos="0" name="os.version" value="3.1"/>
    </fingerprint>
 
+   <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})[_-]Debian[_-]\d{1,2}woody\d">
+      <example service.version="4.0.24">4.0.24_Debian-4woody1</example>
+      <description>Oracle MySQL on Debian 3.0 (woody)</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="os.vendor" value="Debian"/>
+      <param pos="0" name="os.device" value="General"/>
+      <param pos="0" name="os.family" value="Linux"/>
+      <param pos="0" name="os.product" value="Linux"/>
+      <param pos="0" name="os.version" value="3.0"/>
+   </fingerprint>
+
+
+
    <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:[_-]\d{8})?[_-]Debian[_-]\d{1,2}(?:-log)?$">
       <example>4.0.23_Debian-3-log</example>
       <example>4.0.31-20070605_Debian-7-log</example>
@@ -311,7 +385,8 @@
       <param pos="1" name="service.version"/>
       <param pos="0" name="service.vendor" value="Oracle"/>
       <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL Standard Edition"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="service.edition" value="Standard Edition"/>
    </fingerprint>
 
    <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-pro(?:-gpl)?-nt(?:-log)?$">
@@ -321,7 +396,8 @@
       <param pos="1" name="service.version"/>
       <param pos="0" name="service.vendor" value="Oracle"/>
       <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL Commercial Edition"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="service.edition" value="Commercial Edition"/>
       <param pos="0" name="os.vendor" value="Microsoft"/>
       <param pos="0" name="os.device" value="General"/>
       <param pos="0" name="os.family" value="Windows"/>
@@ -335,7 +411,8 @@
       <param pos="1" name="service.version"/>
       <param pos="0" name="service.vendor" value="Oracle"/>
       <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL Commercial Edition"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="service.edition" value="Commercial Edition"/>
    </fingerprint>
 
    <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}sp1)">
@@ -345,7 +422,8 @@
       <param pos="1" name="service.version"/>
       <param pos="0" name="service.vendor" value="Oracle"/>
       <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL Enterprise Edition"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="service.edition" value="Enterprise Edition"/>
    </fingerprint>
 
    <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-enterprise-nt">
@@ -354,7 +432,8 @@
       <param pos="1" name="service.version"/>
       <param pos="0" name="service.vendor" value="Oracle"/>
       <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL Enterprise Edition"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="service.edition" value="Enterprise Edition"/>
       <param pos="0" name="os.vendor" value="Microsoft"/>
       <param pos="0" name="os.device" value="General"/>
       <param pos="0" name="os.family" value="Windows"/>
@@ -368,7 +447,8 @@
       <param pos="1" name="service.version"/>
       <param pos="0" name="service.vendor" value="Oracle"/>
       <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL Enterprise Edition"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="service.edition" value="Enterprise Edition"/>
    </fingerprint>
 
 
@@ -379,7 +459,8 @@
       <param pos="1" name="service.version"/>
       <param pos="0" name="service.vendor" value="Oracle"/>
       <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL Cluster Edition"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="service.edition" value="Cluster Edition"/>
    </fingerprint>
 
    <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-CLUSTERS?(?:-log)?$" flags="REG_ICASE">
@@ -389,7 +470,8 @@
       <param pos="1" name="service.version"/>
       <param pos="0" name="service.vendor" value="Oracle"/>
       <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL Cluster Edition"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="service.edition" value="Cluster Edition"/>
    </fingerprint>
 
    <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-classic(?:-log)?">
@@ -398,7 +480,8 @@
       <param pos="1" name="service.version"/>
       <param pos="0" name="service.vendor" value="Oracle"/>
       <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL Classic Edition"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+      <param pos="0" name="service.edition" value="Classic Edition"/>
    </fingerprint>
 
    <!-- Linux only - http://www.percona.com/services/mysql-support/supported-platforms -->
@@ -410,7 +493,7 @@
       <description>Percona Server (MySQL fork)</description>
       <param pos="1" name="service.version"/>
       <param pos="0" name="service.vendor" value="Percona"/>
-      <param pos="0" name="service.family" value="Percona"/>
+      <param pos="0" name="service.family" value="MySQL"/>
       <param pos="0" name="service.product" value="Percona Server"/>
       <param pos="0" name="os.device" value="General"/>
       <param pos="0" name="os.family" value="Linux"/>
@@ -422,7 +505,7 @@
       <description>Percona Server (MySQL fork)</description>
       <param pos="1" name="service.version"/>
       <param pos="0" name="service.vendor" value="Percona"/>
-      <param pos="0" name="service.family" value="Percona"/>
+      <param pos="0" name="service.family" value="MySQL"/>
       <param pos="0" name="service.product" value="Percona Server"/>
       <param pos="0" name="os.device" value="General"/>
       <param pos="0" name="os.family" value="Linux"/>
@@ -436,7 +519,7 @@
       <description>Percona Server (MySQL fork)</description>
       <param pos="1" name="service.version"/>
       <param pos="0" name="service.vendor" value="Percona"/>
-      <param pos="0" name="service.family" value="Percona"/>
+      <param pos="0" name="service.family" value="MySQL"/>
       <param pos="0" name="service.product" value="Percona Server"/>
       <param pos="0" name="os.device" value="General"/>
       <param pos="0" name="os.family" value="Linux"/>
@@ -530,7 +613,7 @@
       <description>MariaDB MariaDB on Debian Lenny</description>
       <param pos="1" name="service.version"/>
       <param pos="0" name="service.vendor" value="MariaDB"/>
-      <param pos="0" name="service.family" value="MariaDB"/>
+      <param pos="0" name="service.family" value="MySQL"/>
       <param pos="0" name="service.product" value="MariaDB"/>
       <param pos="0" name="os.vendor" value="Debian"/>
       <param pos="0" name="os.device" value="General"/>
@@ -545,7 +628,7 @@
       <description>MariaDB MariaDB</description>
       <param pos="1" name="service.version"/>
       <param pos="0" name="service.vendor" value="MariaDB"/>
-      <param pos="0" name="service.family" value="MariaDB"/>
+      <param pos="0" name="service.family" value="MySQL"/>
       <param pos="0" name="service.product" value="MariaDB"/>
    </fingerprint>
 
@@ -567,7 +650,7 @@
       <description>Tokutek customized MariaDB</description>
       <param pos="1" name="service.version"/>
       <param pos="0" name="service.vendor" value="Tokutek"/>
-      <param pos="0" name="service.family" value="MariaDB"/>
+      <param pos="0" name="service.family" value="MySQL"/>
       <param pos="0" name="service.product" value="MariaDB"/>
    </fingerprint>
 

From 3e6957c640e19c5a3c620b263979fa94a37b8c2e Mon Sep 17 00:00:00 2001
From: Tom Sellers <tom@fadedcode.net>
Date: Sun, 15 Feb 2015 17:01:07 -0600
Subject: [PATCH 03/14] Update correct file..

---
 xml/mysql_banners.xml | 176 +++++++++++++++++++++++++++++++++++-------
 1 file changed, 148 insertions(+), 28 deletions(-)

diff --git a/xml/mysql_banners.xml b/xml/mysql_banners.xml
index efce688f..4a67f8be 100644
--- a/xml/mysql_banners.xml
+++ b/xml/mysql_banners.xml
@@ -7,9 +7,104 @@
 
 <fingerprints>
 
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}(?:-\d{1,2})?)(?:-m\d)?(?:-rc)?(?:-alpha)?(?:-beta)?(?:-gamma)?(?:-?[Mm]ax)?(?:-modified)?(?:-debug)?(?:-log)?$">
-      <example>4.1.20</example>
-      <example>5.5.23-55</example>
+
+  <!-- Common Errors -->
+  
+   <fingerprint pattern="^(?:#HY000)?Host '[^']+' is not allowed to connect to this MySQL server$">
+      <example>Host '10.10.10.10' is not allowed to connect to this MySQL server</example>
+      <example>#HY000Host '10.10.10.10' is not allowed to connect to this MySQL server</example>
+      <description>Oracle MySQL - Error: Host not allowed to connect (English)</description>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+   </fingerprint>
+
+   <fingerprint pattern="^Le h.te '[^']+' n'est pas authoris. . se connecter . ce serveur MySQL$">
+      <example>Le h�te '10.10.10.10' n'est pas authoris� � se connecter � ce serveur MySQL</example>
+      <description>Oracle MySQL - Error: Host not allowed to connect (French)</description>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+   </fingerprint>
+
+   <fingerprint pattern="^'Host' '[^']+' n.o tem permiss.o para se conectar com este servidor MySQL$">
+      <example>'Host' '10.10.10.10' n�o tem permiss�o para se conectar com este servidor MySQL</example>
+      <description>Oracle MySQL - Error: Host not allowed to connect (Spanish)</description>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+   </fingerprint>
+
+  
+   <fingerprint pattern="^Host.+?hat keine Berechtigung,.+?diesem MySQL">
+      <example>Host '10.10.10.10' hat keine Berechtigung, sich mit diesem MySQL-Server zu verbinden</example>
+      <example>Host hat keine Berechtigung, eine Verbindung zu diesem MySQL Server herzustellen.</example>
+      <description>Oracle MySQL - Error: Host not allowed to connect (German)</description>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+   </fingerprint>
+
+   <fingerprint pattern="^(?:#HY000)?Host '[^']+' is blocked because of many connection errors.\s{1,2}[Uu]nblock with 'mysqladmin flush-hosts'$">
+      <example>Host '10.10.10.10' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'</example>
+      <example>Host '10.10.10.10' is blocked because of many connection errors.  Unblock with 'mysqladmin flush-hosts'</example>
+      <description>Oracle MySQL - Error: Blocked, too many errors from this host</description>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+   </fingerprint>
+
+   <fingerprint pattern="^Host.+?blockiert wegen zu vieler Verbindungsfehler. Aufheben der Blockierung mit 'mysqladmin flush-hosts'">
+      <example>Host blockiert wegen zu vieler Verbindungsfehler. Aufheben der Blockierung mit 'mysqladmin flush-hosts'.</example>
+      <example>Host '10.10.10.10' blockiert wegen zu vieler Verbindungsfehler. Aufheben der Blockierung mit 'mysqladmin flush-hosts'</example>
+      <description>Oracle MySQL - Error: Blocked, too many errors from this host (German)</description>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+   </fingerprint>
+
+   <fingerprint pattern="^Host '[^']+' is not allowed to connect to this MariaDB server$">
+      <example>Host '10.10.10.10' is not allowed to connect to this MariaDB server</example>
+      <description>MariaDB MariaDB - Error: Host not allowed to connect (English) </description>
+      <param pos="0" name="service.vendor" value="MariaDB"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MariaDB"/>
+   </fingerprint>
+
+   <fingerprint pattern="^Can't create a new thread \(errno -?[12]{1,2}\)">
+      <example>Can't create a new thread (errno -1); if you are not out of available memory, you can consult the manual for a possible OS-dependent bug</example>
+      <example>Can't create a new thread (errno 12); if you are not out of available memory, you can consult the manual for a possible OS-dependent bug</example>
+      <description>Oracle MySQL - Error: Out of memory</description>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+   </fingerprint>
+
+
+   <fingerprint pattern="^Too many connections$">
+      <example>Too many connections</example>
+      <description>Oracle MySQL - Error: Too many connections</description>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+   </fingerprint>
+
+   <fingerprint pattern="^Can't get hostname for your address$">
+      <example>Can't get hostname for your address</example>
+      <description>Oracle MySQL - Error: Unable to resolve client hostname</description>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+   </fingerprint>
+
+    <!-- Standard Banner Matches -->
+
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}(?:[.-]\d{1,2})?)(?:-m\d{1,2})?(?:-rc)?(?:-alpha)?(?:-beta)?(?:-gamma)?(?:-?[Mm]ax)?(?:-rs)?(?:-modified)?(?:-debug)?(?:-log)?$">
+      <example service.version="4.1.20">4.1.20</example>
+      <example service.version="5.5.23-55">5.5.23-55</example>
+      <example service.version="5.5.18.1">5.5.18.1-log</example>
+      <example service.version="5.7.4">5.7.4-m14</example>
+      <example service.version="5.0.95">5.0.95-rs</example>
       <example>5.1.65-log</example>
       <example>5.4.1-beta-log</example>
       <example>4.1.13-Max-log</example>
@@ -18,7 +113,7 @@
       <example>5.5.3-m3-log</example>
       <example>4.0.20a-debug</example>
       <example>5.1.37-debug-log</example>
-      <description>Oracle MySQL</description>
+      <description>Oracle MySQL (common)</description>
       <param pos="1" name="service.version"/>
       <param pos="0" name="service.vendor" value="Oracle"/>
       <param pos="0" name="service.family" value="MySQL"/>
@@ -26,12 +121,12 @@
    </fingerprint>
 
    <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:-alpha)?(?:-beta)?(?:-rc)?-community(?:-max)?-nt(?:-log)?(?:-debug)?(?:-log)?$">
-      <example>4.1.22-community-max-nt</example>
-      <example>5.0.88-community-nt</example>
-      <example>5.0.67-community-nt-log</example>
-      <example>5.1.20-beta-community-nt-debug</example>
-      <example>6.0.0-alpha-community-nt-debug</example>
-      <example>6.0.2-alpha-community-nt-debug-log </example>
+      <example service.version="4.1.22">4.1.22-community-max-nt</example>
+      <example service.version="5.0.88">5.0.88-community-nt</example>
+      <example service.version="5.0.67">5.0.67-community-nt-log</example>
+      <example service.version="5.1.20">5.1.20-beta-community-nt-debug</example>
+      <example service.version="6.0.0">6.0.0-alpha-community-nt-debug</example>
+      <example service.version="6.0.2">6.0.2-alpha-community-nt-debug-log</example>
       <description>Oracle MySQL Community Edition with Named Pipes (Windows)</description>
       <param pos="1" name="service.version"/>
       <param pos="0" name="service.vendor" value="Oracle"/>
@@ -157,14 +252,14 @@
       <param pos="2" name="os.version"/>
    </fingerprint>
 
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})[-_](?:Ubuntu[_-])?(?:Debian[_-])?\d{1,2}ubuntu\d{1,2}(?:\.\d)?(?:-log)?$">
-      <example>5.0.45-Debian_1ubuntu3.4</example> 
-      <example>5.0.51a-3ubuntu5.5</example>
-      <example>5.0.51a-3ubuntu5.8-log</example>
-      <example>5.0.75-0ubuntu10.2</example>
-      <example>5.1.58-1ubuntu1</example>
-      <example>4.0.24_Debian-10ubuntu2-log</example>
-      <example>4.0.24_Debian-10ubuntu2-log</example>
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})[-_](?:Ubuntu[_-])?(?:Debian[_-])?\d{1,2}(?:~exp1)?ubuntu\d{1,2}(?:\.\d)?(?:-log)?$">
+      <example service.version="5.0.45">5.0.45-Debian_1ubuntu3.4</example>
+      <example service.version="5.0.51a">5.0.51a-3ubuntu5.5</example>
+      <example service.version="5.0.51a">5.0.51a-3ubuntu5.8-log</example>
+      <example service.version="5.0.75">5.0.75-0ubuntu10.2</example>
+      <example service.version="5.1.58">5.1.58-1ubuntu1</example>
+      <example service.version="4.0.24">4.0.24_Debian-10ubuntu2-log</example>
+      <example service.version="5.6.19">5.6.19-1~exp1ubuntu2-log</example>
       <description>Oracle MySQL on Ubuntu where trailing digits aren't OS version</description>
       <param pos="1" name="service.version"/>
       <param pos="0" name="service.vendor" value="Oracle"/>
@@ -529,7 +624,7 @@
    <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-nmm">
       <example>4.0.27-nmm1-log</example>
       <example>4.1.22-nmm-1-log</example>
-      <description>Oracle MySQL</description>
+      <description>Oracle MySQL (nmm variant)</description>
       <param pos="1" name="service.version"/>
       <param pos="0" name="service.vendor" value="Oracle"/>
       <param pos="0" name="service.family" value="MySQL"/>
@@ -547,7 +642,7 @@
 
    <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-SERVER">
       <example>5.1.30-SERVER-104</example>
-      <description>Oracle MySQL</description>
+      <description>Oracle MySQL (SERVER variant)</description>
       <param pos="1" name="service.version"/>
       <param pos="0" name="service.vendor" value="Oracle"/>
       <param pos="0" name="service.family" value="MySQL"/>
@@ -556,7 +651,7 @@
 
    <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-ISPrime">
       <example>4.0.15a-ISPrime</example>
-      <description>Oracle MySQL</description>
+      <description>Oracle MySQL (ISPrime variant)</description>
       <param pos="1" name="service.version"/>
       <param pos="0" name="service.vendor" value="Oracle"/>
       <param pos="0" name="service.family" value="MySQL"/>
@@ -598,9 +693,9 @@
       <param pos="0" name="os.product" value="Linux"/>
    </fingerprint>
 
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-Alibaba-\d{6}(?:-log)?$">
-      <example>5.1.61-Alibaba-120201-log</example>
-      <example>5.1.61-Alibaba-121011-log</example>
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-Alibaba(?:-rds)?-\d{6}(?:-log)?$">
+      <example service.version="5.1.61">5.1.61-Alibaba-121011-log</example>
+      <example service.version="5.1.61">5.1.61-Alibaba-rds-201404-log</example>
       <description>Oracle MySQL Alibaba build? distro? Aliyun.com hosted?</description>
       <param pos="1" name="service.version"/>
       <param pos="0" name="service.vendor" value="Oracle"/>
@@ -623,8 +718,8 @@
    </fingerprint>
 
    <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-[Mm]aria">
-      <example>5.1.39-maria-beta</example>
-      <example>5.5.24-MariaDB-mariadb1~0.1</example>
+      <example service.version="5.1.39">5.1.39-maria-beta</example>
+      <example service.version="5.5.24">5.5.24-MariaDB-mariadb1~0.1</example>
       <description>MariaDB MariaDB</description>
       <param pos="1" name="service.version"/>
       <param pos="0" name="service.vendor" value="MariaDB"/>
@@ -633,8 +728,8 @@
    </fingerprint>
 
    <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-falcon-alpha-community-nt">
-      <example>5.2.0-falcon-alpha-community-nt</example>
-      <description>Oracle MySQL with defunct Falcon Storage Engine</description>
+      <example service.version="5.2.0">5.2.0-falcon-alpha-community-nt</example>
+      <description>Oracle MySQL with defunct Falcon Storage Engine with Named Pipes (Windows)</description>
       <param pos="1" name="service.version"/>
       <param pos="0" name="service.vendor" value="Oracle"/>
       <param pos="0" name="service.family" value="MySQL"/>
@@ -645,6 +740,15 @@
       <param pos="0" name="os.product" value="Windows"/>
    </fingerprint>
 
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-falcon-alpha(?:-log)?$">
+      <example service.version="5.2.0">5.2.0-falcon-alpha-log</example>
+      <description>Oracle MySQL with defunct Falcon Storage Engine</description>
+      <param pos="1" name="service.version"/>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL"/>
+   </fingerprint>
+
    <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-tokudb-.*MariaDB(?:-log)?$">
       <example>5.5.25-tokudb-6.1.1-47477-MariaDB-log</example>
       <description>Tokutek customized MariaDB</description>
@@ -748,4 +852,20 @@
       <param pos="0" name="service.family" value="MySQL"/>
       <param pos="0" name="service.product" value="MySQL"/>
    </fingerprint>
+
+   <fingerprint pattern="^#07000Proxy Warning - IP Forbidden$">
+      <example>#07000Proxy Warning - IP Forbidden</example>
+      <description>Oracle MySQL Proxy - Error: Host not allowed to connect</description>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL Proxy"/>
+   </fingerprint>
+
+   <fingerprint pattern="^\(proxy\) all backends are down$">
+      <example>(proxy) all backends are down</example>
+      <description>Oracle MySQL Proxy - Error: Backends down</description>
+      <param pos="0" name="service.vendor" value="Oracle"/>
+      <param pos="0" name="service.family" value="MySQL"/>
+      <param pos="0" name="service.product" value="MySQL Proxy"/>
+   </fingerprint>
 </fingerprints>

From 8f462c171c4ed86434807ecab3fd8c28d25dd3aa Mon Sep 17 00:00:00 2001
From: Tom Sellers <tom@fadedcode.net>
Date: Thu, 19 Feb 2015 05:59:03 -0600
Subject: [PATCH 04/14] Fix indent, add example matches

---
 xml/mysql_banners.xml | 1713 ++++++++++++++++++++---------------------
 1 file changed, 846 insertions(+), 867 deletions(-)

diff --git a/xml/mysql_banners.xml b/xml/mysql_banners.xml
index 4a67f8be..fe56061e 100644
--- a/xml/mysql_banners.xml
+++ b/xml/mysql_banners.xml
@@ -1,871 +1,850 @@
 <?xml version="1.0"?>
-<!--
-  References:  
-  Error codes:  http://dev.mysql.com/doc/refman/5.5/en/error-messages-server.html
--->
-
-
 <fingerprints>
-
-
   <!-- Common Errors -->
-  
-   <fingerprint pattern="^(?:#HY000)?Host '[^']+' is not allowed to connect to this MySQL server$">
-      <example>Host '10.10.10.10' is not allowed to connect to this MySQL server</example>
-      <example>#HY000Host '10.10.10.10' is not allowed to connect to this MySQL server</example>
-      <description>Oracle MySQL - Error: Host not allowed to connect (English)</description>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-   </fingerprint>
-
-   <fingerprint pattern="^Le h.te '[^']+' n'est pas authoris. . se connecter . ce serveur MySQL$">
-      <example>Le h�te '10.10.10.10' n'est pas authoris� � se connecter � ce serveur MySQL</example>
-      <description>Oracle MySQL - Error: Host not allowed to connect (French)</description>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-   </fingerprint>
-
-   <fingerprint pattern="^'Host' '[^']+' n.o tem permiss.o para se conectar com este servidor MySQL$">
-      <example>'Host' '10.10.10.10' n�o tem permiss�o para se conectar com este servidor MySQL</example>
-      <description>Oracle MySQL - Error: Host not allowed to connect (Spanish)</description>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-   </fingerprint>
-
-  
-   <fingerprint pattern="^Host.+?hat keine Berechtigung,.+?diesem MySQL">
-      <example>Host '10.10.10.10' hat keine Berechtigung, sich mit diesem MySQL-Server zu verbinden</example>
-      <example>Host hat keine Berechtigung, eine Verbindung zu diesem MySQL Server herzustellen.</example>
-      <description>Oracle MySQL - Error: Host not allowed to connect (German)</description>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(?:#HY000)?Host '[^']+' is blocked because of many connection errors.\s{1,2}[Uu]nblock with 'mysqladmin flush-hosts'$">
-      <example>Host '10.10.10.10' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'</example>
-      <example>Host '10.10.10.10' is blocked because of many connection errors.  Unblock with 'mysqladmin flush-hosts'</example>
-      <description>Oracle MySQL - Error: Blocked, too many errors from this host</description>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-   </fingerprint>
-
-   <fingerprint pattern="^Host.+?blockiert wegen zu vieler Verbindungsfehler. Aufheben der Blockierung mit 'mysqladmin flush-hosts'">
-      <example>Host blockiert wegen zu vieler Verbindungsfehler. Aufheben der Blockierung mit 'mysqladmin flush-hosts'.</example>
-      <example>Host '10.10.10.10' blockiert wegen zu vieler Verbindungsfehler. Aufheben der Blockierung mit 'mysqladmin flush-hosts'</example>
-      <description>Oracle MySQL - Error: Blocked, too many errors from this host (German)</description>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-   </fingerprint>
-
-   <fingerprint pattern="^Host '[^']+' is not allowed to connect to this MariaDB server$">
-      <example>Host '10.10.10.10' is not allowed to connect to this MariaDB server</example>
-      <description>MariaDB MariaDB - Error: Host not allowed to connect (English) </description>
-      <param pos="0" name="service.vendor" value="MariaDB"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MariaDB"/>
-   </fingerprint>
-
-   <fingerprint pattern="^Can't create a new thread \(errno -?[12]{1,2}\)">
-      <example>Can't create a new thread (errno -1); if you are not out of available memory, you can consult the manual for a possible OS-dependent bug</example>
-      <example>Can't create a new thread (errno 12); if you are not out of available memory, you can consult the manual for a possible OS-dependent bug</example>
-      <description>Oracle MySQL - Error: Out of memory</description>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-   </fingerprint>
-
-
-   <fingerprint pattern="^Too many connections$">
-      <example>Too many connections</example>
-      <description>Oracle MySQL - Error: Too many connections</description>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-   </fingerprint>
-
-   <fingerprint pattern="^Can't get hostname for your address$">
-      <example>Can't get hostname for your address</example>
-      <description>Oracle MySQL - Error: Unable to resolve client hostname</description>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-   </fingerprint>
-
-    <!-- Standard Banner Matches -->
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}(?:[.-]\d{1,2})?)(?:-m\d{1,2})?(?:-rc)?(?:-alpha)?(?:-beta)?(?:-gamma)?(?:-?[Mm]ax)?(?:-rs)?(?:-modified)?(?:-debug)?(?:-log)?$">
-      <example service.version="4.1.20">4.1.20</example>
-      <example service.version="5.5.23-55">5.5.23-55</example>
-      <example service.version="5.5.18.1">5.5.18.1-log</example>
-      <example service.version="5.7.4">5.7.4-m14</example>
-      <example service.version="5.0.95">5.0.95-rs</example>
-      <example>5.1.65-log</example>
-      <example>5.4.1-beta-log</example>
-      <example>4.1.13-Max-log</example>
-      <example>5.1.33max-log</example>
-      <example>5.0.87-modified-log</example>
-      <example>5.5.3-m3-log</example>
-      <example>4.0.20a-debug</example>
-      <example>5.1.37-debug-log</example>
-      <description>Oracle MySQL (common)</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:-alpha)?(?:-beta)?(?:-rc)?-community(?:-max)?-nt(?:-log)?(?:-debug)?(?:-log)?$">
-      <example service.version="4.1.22">4.1.22-community-max-nt</example>
-      <example service.version="5.0.88">5.0.88-community-nt</example>
-      <example service.version="5.0.67">5.0.67-community-nt-log</example>
-      <example service.version="5.1.20">5.1.20-beta-community-nt-debug</example>
-      <example service.version="6.0.0">6.0.0-alpha-community-nt-debug</example>
-      <example service.version="6.0.2">6.0.2-alpha-community-nt-debug-log</example>
-      <description>Oracle MySQL Community Edition with Named Pipes (Windows)</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="service.edition" value="Community Edition"/>
-      <param pos="0" name="os.vendor" value="Microsoft"/>
-      <param pos="0" name="os.device" value="General"/>
-      <param pos="0" name="os.family" value="Windows"/>
-      <param pos="0" name="os.product" value="Windows"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:-m\d)?(?:-rc)?(?:-alpha)?(?:-beta)?-[Cc]ommunity(?:-max)?(?:-debug)?(?:-log)?(?:-debug)?$">
-      <example>5.0.95-community-log</example>
-      <example>5.0.37-Community-log</example>
-      <example>5.0.21-community-max</example>
-      <example>5.5.0-m2-community-log</example>
-      <example>6.0.4-alpha-community</example>
-      <example>5.1.33-community-debug</example>
-      <example>5.5.0-m2-community-debug-log</example>
-      <description>Oracle MySQL Community Edition</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="service.edition" value="Community Edition"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:-alpha)?(?:-beta)?(?:-rc)?(?:-gamma)?(?:-max)?-nt(?:-max)?(?:-log)?$">
-      <example>5.0.18-nt</example>
-      <example>4.1.12a-nt-max-log</example>
-      <example>3.23.58-max-nt</example>
-      <example>5.1.6-alpha-nt-max</example>
-      <example>4.0.11-gamma-max-nt</example>
-      <description>Oracle MySQL with Named Pipes (Windows)</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="os.vendor" value="Microsoft"/>
-      <param pos="0" name="os.device" value="General"/>
-      <param pos="0" name="os.family" value="Windows"/>
-      <param pos="0" name="os.product" value="Windows"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-cll$">
-      <example>5.5.25a-cll</example>
-      <description>Oracle MySQL hosted on CPanel</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="os.device" value="General"/>
-      <param pos="0" name="os.family" value="Linux"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-community-cll$">
-      <example>5.0.91-community-cll</example>
-      <description>Oracle MySQL Community hosted on CPanel</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="service.edition" value="Community Edition"/>
-      <param pos="0" name="os.device" value="General"/>
-      <param pos="0" name="os.family" value="Linux"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-cll-lve$">
-      <example>5.1.66-cll-lve</example>
-      <description>Oracle MySQL on CloudLinux in a Lightweight Virtual Environment (LVE)</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="os.vendor" value="CloudLinux"/>
-      <param pos="0" name="os.device" value="General"/>
-      <param pos="0" name="os.family" value="Linux"/>
-      <param pos="0" name="os.product" value="Linux"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-community-cll-lve$">
-      <example>5.0.95-community-cll-lve</example>
-      <description>Oracle MySQL Community on CloudLinux in a Lightweight Virtual Environment (LVE)</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="service.edition" value="Community Edition"/>
-      <param pos="0" name="os.vendor" value="CloudLinux"/>
-      <param pos="0" name="os.device" value="General"/>
-      <param pos="0" name="os.family" value="Linux"/>
-      <param pos="0" name="os.product" value="Linux"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})-0ubuntu0.(\d\d\.\d\d)">
-      <example>5.1.66-0ubuntu0.10.04.3-log</example>
-      <example>5.5.28-0ubuntu0.12.04.3-log</example>
-      <description>Oracle MySQL on Ubuntu</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="os.vendor" value="Ubuntu"/>
-      <param pos="0" name="os.device" value="General"/>
-      <param pos="0" name="os.family" value="Linux"/>
-      <param pos="0" name="os.product" value="Linux"/>
-      <param pos="2" name="os.version"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})-(?:Debian_)?\dubuntu(\d{1,2}\.\d\d)">
-      <example>5.0.22-Debian_0ubuntu6.06.14-log</example>
-      <example>5.1.41-3ubuntu12.10</example>
-      <description>Oracle MySQL on Ubuntu</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="os.vendor" value="Ubuntu"/>
-      <param pos="0" name="os.device" value="General"/>
-      <param pos="0" name="os.family" value="Linux"/>
-      <param pos="0" name="os.product" value="Linux"/>
-      <param pos="2" name="os.version"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})[-_](?:Ubuntu[_-])?(?:Debian[_-])?\d{1,2}(?:~exp1)?ubuntu\d{1,2}(?:\.\d)?(?:-log)?$">
-      <example service.version="5.0.45">5.0.45-Debian_1ubuntu3.4</example>
-      <example service.version="5.0.51a">5.0.51a-3ubuntu5.5</example>
-      <example service.version="5.0.51a">5.0.51a-3ubuntu5.8-log</example>
-      <example service.version="5.0.75">5.0.75-0ubuntu10.2</example>
-      <example service.version="5.1.58">5.1.58-1ubuntu1</example>
-      <example service.version="4.0.24">4.0.24_Debian-10ubuntu2-log</example>
-      <example service.version="5.6.19">5.6.19-1~exp1ubuntu2-log</example>
-      <description>Oracle MySQL on Ubuntu where trailing digits aren't OS version</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="os.vendor" value="Ubuntu"/>
-      <param pos="0" name="os.device" value="General"/>
-      <param pos="0" name="os.family" value="Linux"/>
-      <param pos="0" name="os.product" value="Linux"/>
-   </fingerprint>
-
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.[^+]+)\+deb\.sury\.org~precise\+\d(?:-log)?$">
-      <example service.version="5.6.19-1">5.6.19-1+deb.sury.org~precise+1</example>
-      <example service.version="5.6.20-1">5.6.20-1+deb.sury.org~precise+1-log</example>
-      <description>Oracle MySQL on Ubuntu 12.04 (Precise Pangolin) packaged by deb.sury.org</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="os.vendor" value="Ubuntu"/>
-      <param pos="0" name="os.device" value="General"/>
-      <param pos="0" name="os.family" value="Linux"/>
-      <param pos="0" name="os.product" value="Linux"/>
-      <param pos="0" name="os.version" value="12.04"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.[^+]+)\+deb\.sury\.org~trusty\+\d(?:-log)?$">
-      <example service.version="5.6.21-1">5.6.21-1+deb.sury.org~trusty+1</example>
-      <example service.version="5.6.19-1">5.6.19-1+deb.sury.org~trusty+1-log</example>
-      <description>Oracle MySQL on Ubuntu 14.04 (Trusty Tahr) packaged by deb.sury.org</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="os.vendor" value="Ubuntu"/>
-      <param pos="0" name="os.device" value="General"/>
-      <param pos="0" name="os.family" value="Linux"/>
-      <param pos="0" name="os.product" value="Linux"/>
-      <param pos="0" name="os.version" value="14.04"/>
-   </fingerprint>
-
-
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.[^+]+)\+(?:squeeze\d|deb6u1)(?:-log)?$">
-      <example service.version="5.1.66-0">5.1.66-0+squeeze1</example>
-      <example service.version="5.1.66-0">5.1.66-0+squeeze1-log</example>
-      <example service.version="5.1.73-1">5.1.73-1+deb6u1</example>
-      <description>Oracle MySQL on Debian 6.0 (squeeze)</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="os.vendor" value="Debian"/>
-      <param pos="0" name="os.device" value="General"/>
-      <param pos="0" name="os.family" value="Linux"/>
-      <param pos="0" name="os.product" value="Linux"/>
-      <param pos="0" name="os.version" value="6.0"/>
-   </fingerprint>
-
-
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.[^+]+)\+wheezy\d(?:-log)?$">
-      <example service.version="5.5.41-0">5.5.41-0+wheezy1</example>
-      <example service.version="5.5.35-0">5.5.35-0+wheezy1-log</example>
-      <description>Oracle MySQL on Debian 7.0 (wheezy)</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="os.vendor" value="Debian"/>
-      <param pos="0" name="os.device" value="General"/>
-      <param pos="0" name="os.family" value="Linux"/>
-      <param pos="0" name="os.product" value="Linux"/>
-      <param pos="0" name="os.version" value="7.0"/>
-   </fingerprint>
-
-
-
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.[^+]+)\+lenny">
-      <example>5.0.51a-24+lenny1-log</example>
-      <example>5.0.51a-24+lenny2</example>
-      <description>Oracle MySQL on Debian 5.0 (lenny)</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="os.vendor" value="Debian"/>
-      <param pos="0" name="os.device" value="General"/>
-      <param pos="0" name="os.family" value="Linux"/>
-      <param pos="0" name="os.product" value="Linux"/>
-      <param pos="0" name="os.version" value="5.0"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-\d~bpo50">
-      <example>5.1.49-3~bpo50+1-log</example>
-      <description>Oracle MySQL Backport on Debian 5.0 (lenny)</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="os.vendor" value="Debian"/>
-      <param pos="0" name="os.device" value="General"/>
-      <param pos="0" name="os.family" value="Linux"/>
-      <param pos="0" name="os.product" value="Linux"/>
-      <param pos="0" name="os.version" value="5.0"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-Debian_\d~?bpo\.?\d">
-      <example>5.0.22-Debian_2bpo1</example>
-      <example>5.0.32-Debian_7~bpo.1-log</example>
-      <description>Oracle MySQL Backport on Debian</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="os.vendor" value="Debian"/>
-      <param pos="0" name="os.device" value="General"/>
-      <param pos="0" name="os.family" value="Linux"/>
-      <param pos="0" name="os.product" value="Linux"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})-Debian_\d?etch\d">
-      <example>4.1.11-Debian_etch1-log</example>
-      <example>5.0.32-Debian_7etch6-log</example>
-      <description>Oracle MySQL on Debian 4.0 (etch)</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="os.vendor" value="Debian"/>
-      <param pos="0" name="os.device" value="General"/>
-      <param pos="0" name="os.family" value="Linux"/>
-      <param pos="0" name="os.product" value="Linux"/>
-      <param pos="0" name="os.version" value="4.0"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})[_-]Debian[_-]\d{1,2}sarge\d">
-      <example>4.0.24_Debian-10sarge2-log</example>
-      <example>4.1.11-Debian_4sarge7-log</example>
-      <description>Oracle MySQL on Debian 3.1 (sarge)</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="os.vendor" value="Debian"/>
-      <param pos="0" name="os.device" value="General"/>
-      <param pos="0" name="os.family" value="Linux"/>
-      <param pos="0" name="os.product" value="Linux"/>
-      <param pos="0" name="os.version" value="3.1"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})[_-]Debian[_-]\d{1,2}woody\d">
-      <example service.version="4.0.24">4.0.24_Debian-4woody1</example>
-      <description>Oracle MySQL on Debian 3.0 (woody)</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="os.vendor" value="Debian"/>
-      <param pos="0" name="os.device" value="General"/>
-      <param pos="0" name="os.family" value="Linux"/>
-      <param pos="0" name="os.product" value="Linux"/>
-      <param pos="0" name="os.version" value="3.0"/>
-   </fingerprint>
-
-
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:[_-]\d{8})?[_-]Debian[_-]\d{1,2}(?:-log)?$">
-      <example>4.0.23_Debian-3-log</example>
-      <example>4.0.31-20070605_Debian-7-log</example>
-      <description>Oracle MySQL on Debian (Generic match)</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="os.vendor" value="Debian"/>
-      <param pos="0" name="os.device" value="General"/>
-      <param pos="0" name="os.family" value="Linux"/>
-      <param pos="0" name="os.product" value="Linux"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})(?:-rc)?[_-]Debian[_-]\d{1,2}~ppa\d(?:-log)?$">
-      <example>5.1.22-rc-Debian_2~ppa5-log</example>
-      <description>Oracle MySQL on Debian (Generic match) using PPA</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="os.vendor" value="Debian"/>
-      <param pos="0" name="os.device" value="General"/>
-      <param pos="0" name="os.family" value="Linux"/>
-      <param pos="0" name="os.product" value="Linux"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}(?:-\d{1,2})?)(?:-Debian)?(?:-Dotdeb)?[-~_\d\.]+dotdeb\.\d(?:-log)?$">
-      <example>5.1.54-0.dotdeb.0</example>
-      <example>5.1.58-1~dotdeb.0</example>
-      <example>5.5.30-1~dotdeb.0-log</example>
-      <example>5.1.30-Dotdeb_0.dotdeb.0-log</example>
-      <description>Oracle MySQL packaged by DotDeb.org</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="os.vendor" value="Debian"/>
-      <param pos="0" name="os.device" value="General"/>
-      <param pos="0" name="os.family" value="Linux"/>
-      <param pos="0" name="os.product" value="Linux"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:-alpha)?(?:-beta)?(?:-gamma)?(?:-rc)?-standard(?:-log)?$">
-      <example>5.0.13-rc-standard-log</example>
-      <example>5.0.37-standard</example>
-      <example>5.0.51a-standard-log</example>
-      <description>Oracle MySQL Standard Edition</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="service.edition" value="Standard Edition"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-pro(?:-gpl)?-nt(?:-log)?$">
-      <example>5.0.24-pro-nt</example>
-      <example>4.1.25-pro-gpl-nt-log</example>
-      <description>Oracle MySQL Commercial Edition with Named Pipes (Windows)</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="service.edition" value="Commercial Edition"/>
-      <param pos="0" name="os.vendor" value="Microsoft"/>
-      <param pos="0" name="os.device" value="General"/>
-      <param pos="0" name="os.family" value="Windows"/>
-      <param pos="0" name="os.product" value="Windows"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-pro(?:-gpl)?(?:-log)?">
-      <example>4.1.23-pro-gpl-log</example>
-      <example>5.0.17c-pro-gpl-cert</example>
-      <description>Oracle MySQL Commercial Edition</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="service.edition" value="Commercial Edition"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}sp1)">
-      <example>5.0.82sp1</example>
-      <example>5.1.46sp1-enterprise-gpl-advanced-log</example>
-      <description>Oracle MySQL Enterprise Edition</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="service.edition" value="Enterprise Edition"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-enterprise-nt">
-      <example>5.0.84-enterprise-nt</example>
-      <description>Oracle MySQL Enterprise Edition with Named Pipes (Windows)</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="service.edition" value="Enterprise Edition"/>
-      <param pos="0" name="os.vendor" value="Microsoft"/>
-      <param pos="0" name="os.device" value="General"/>
-      <param pos="0" name="os.family" value="Windows"/>
-      <param pos="0" name="os.product" value="Windows"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:-rc)?-enterprise">
-      <example>5.1.26-rc-enterprise-gpl-log</example>
-      <example>5.5.27-enterprise-commercial-advanced-log</example>
-      <description>Oracle MySQL Enterprise Edition</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="service.edition" value="Enterprise Edition"/>
-   </fingerprint>
-
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}-ndb-\d\.\d{1,2}\.\h{1,3})">
-      <example>5.1.30-ndb-6.3.20-cluster-gpl-log</example>
-      <example>5.5.20-ndb-7.2.5-gpl</example>
-      <description>Oracle MySQL Cluster Edition</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="service.edition" value="Cluster Edition"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-CLUSTERS?(?:-log)?$" flags="REG_ICASE">
-      <example>4.1.21-CLUSTERS</example>
-      <example>5.0.46-cluster</example>
-      <description>Oracle MySQL Cluster Edition</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="service.edition" value="Cluster Edition"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-classic(?:-log)?">
-      <example>5.0.86-classic-log</example>
-      <description>Oracle MySQL Classic Edition</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="service.edition" value="Classic Edition"/>
-   </fingerprint>
-
-   <!-- Linux only - http://www.percona.com/services/mysql-support/supported-platforms -->
-   <!-- Build list - http://www.percona.com/doc/percona-server/5.1/release-notes/release-notes_index.html -->
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}-?rel\d\d\.\d)(?:-log)?">
-      <example>5.1.57-rel12.8</example>
-      <example>5.1.60rel13.1-log</example>
-      <example>5.1.67-rel14.3-log</example>
-      <description>Percona Server (MySQL fork)</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Percona"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="Percona Server"/>
-      <param pos="0" name="os.device" value="General"/>
-      <param pos="0" name="os.family" value="Linux"/>
-      <param pos="0" name="os.product" value="Linux"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}-\d\d\.\d)">
-      <example>5.5.28-29.3-log</example>
-      <description>Percona Server (MySQL fork)</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Percona"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="Percona Server"/>
-      <param pos="0" name="os.device" value="General"/>
-      <param pos="0" name="os.family" value="Linux"/>
-      <param pos="0" name="os.product" value="Linux"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-(?:rc)?[Pp]ercona">
-      <example>5.1.50-percona</example>      
-      <example>5.5.27-percona-sure1-log</example>
-      <example>5.5.7-rcPercona-Server-log</example>
-      <description>Percona Server (MySQL fork)</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Percona"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="Percona Server"/>
-      <param pos="0" name="os.device" value="General"/>
-      <param pos="0" name="os.family" value="Linux"/>
-      <param pos="0" name="os.product" value="Linux"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-nmm">
-      <example>4.0.27-nmm1-log</example>
-      <example>4.1.22-nmm-1-log</example>
-      <description>Oracle MySQL (nmm variant)</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-nightly-\d{8}(?:-log)?$">
-      <example>3.23.59-nightly-20050301-log</example>
-      <description>Oracle MySQL nightly build</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-SERVER">
-      <example>5.1.30-SERVER-104</example>
-      <description>Oracle MySQL (SERVER variant)</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-ISPrime">
-      <example>4.0.15a-ISPrime</example>
-      <description>Oracle MySQL (ISPrime variant)</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-rc-\d\.\d{1,2}\.\h{1,3}">
-      <example>5.1.26-rc-5.1.26rc-log</example>
-      <description>Oracle MySQL possibly Debian specific</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-ius(?:-log)?$">
-      <example>5.1.66-ius-log</example>
-      <description>Oracle MySQL packaged for RHEL/CentOS by IUS</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="os.device" value="General"/>
-      <param pos="0" name="os.family" value="Linux"/>
-      <param pos="0" name="os.product" value="Linux"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})[\.-]d\d{1,2}-ourdelta\d{0,2}(?:-log)?$">
-      <example>5.0.67.d7-ourdelta-log</example>
-      <example>5.0.87-d10-ourdelta65-log</example>
-      <description>Oracle MySQL tweaked and packaged by OurDelta</description>
-      <!-- They also have a MariaDB based one based on 5.1 -->
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="os.device" value="General"/>
-      <param pos="0" name="os.family" value="Linux"/>
-      <param pos="0" name="os.product" value="Linux"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-Alibaba(?:-rds)?-\d{6}(?:-log)?$">
-      <example service.version="5.1.61">5.1.61-Alibaba-121011-log</example>
-      <example service.version="5.1.61">5.1.61-Alibaba-rds-201404-log</example>
-      <description>Oracle MySQL Alibaba build? distro? Aliyun.com hosted?</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-MariaDB.+~lenny(?:-log)?$">
-      <example>5.3.2-MariaDB-beta-mariadb102~lenny</example>
-      <description>MariaDB MariaDB on Debian Lenny</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="MariaDB"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MariaDB"/>
-      <param pos="0" name="os.vendor" value="Debian"/>
-      <param pos="0" name="os.device" value="General"/>
-      <param pos="0" name="os.family" value="Linux"/>
-      <param pos="0" name="os.product" value="Linux"/>
-      <param pos="0" name="os.version" value="5.0"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-[Mm]aria">
-      <example service.version="5.1.39">5.1.39-maria-beta</example>
-      <example service.version="5.5.24">5.5.24-MariaDB-mariadb1~0.1</example>
-      <description>MariaDB MariaDB</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="MariaDB"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MariaDB"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-falcon-alpha-community-nt">
-      <example service.version="5.2.0">5.2.0-falcon-alpha-community-nt</example>
-      <description>Oracle MySQL with defunct Falcon Storage Engine with Named Pipes (Windows)</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="os.vendor" value="Microsoft"/>
-      <param pos="0" name="os.device" value="General"/>
-      <param pos="0" name="os.family" value="Windows"/>
-      <param pos="0" name="os.product" value="Windows"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-falcon-alpha(?:-log)?$">
-      <example service.version="5.2.0">5.2.0-falcon-alpha-log</example>
-      <description>Oracle MySQL with defunct Falcon Storage Engine</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-tokudb-.*MariaDB(?:-log)?$">
-      <example>5.5.25-tokudb-6.1.1-47477-MariaDB-log</example>
-      <description>Tokutek customized MariaDB</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Tokutek"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MariaDB"/>
-   </fingerprint>
-
-   <fingerprint pattern="^^(\d\.\d{1,2}\.\h{1,3})-Sphinx">
-      <example>5.1.40-Sphinx</example>
-      <description>Oracle MySQL with the Sphinx full text search engine</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:[^+]+)?\+tld\d">
-      <example>5.0.91+tld0-log</example>
-      <example>5.1.57-5.1.57+tld2-log</example>
-      <description>Oracle MySQL packaged by TLD Linux</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="os.vendor" value="TLD"/>
-      <param pos="0" name="os.device" value="General"/>
-      <param pos="0" name="os.family" value="Linux"/>
-      <param pos="0" name="os.product" value="Linux"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-Debian_\d\.infrant\d$">
-      <example>5.0.24a-Debian_3.infrant1</example>
-      <description>Oracle MySQL on a Netgear ReadyNAS</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-      <param pos="0" name="os.vendor" value="Debian"/>
-      <param pos="0" name="os.device" value="General"/>
-      <param pos="0" name="os.family" value="Linux"/>
-      <param pos="0" name="os.product" value="Linux"/>
-      <param pos="0" name="hw.vendor" value="Netgear"/>
-      <param pos="0" name="hw.device" value="General"/>
-      <param pos="0" name="hw.family" value="ReadyNAS"/>
-      <param pos="0" name="hw.product" value="ReadyNAS"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-beget(?:-log)?$">
-      <example>5.1.61-beget-log</example>
-      <description>Oracle MySQL at Ukrainian hoster BeGet(?)</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-(?:Linuxtone.Org|LTOPS)(?:-log)?$">
-      <example>5.0.56-Linuxtone.Org</example>
-      <example>5.1.53-LTOPS-log</example>
-      <description>Oracle MySQL at Chinese hoster Linuxtone.org</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-xencdn.net(?:-log)?$">
-      <example>5.1.66-xencdn.net-log</example>
-      <description>Oracle MySQL at Chinese hoster Xencdn.net</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-Comsenz(?:-log)?$">
-      <example>5.0.27-Comsenz-log</example>
-      <description>Oracle MySQL at Chinese hoster Comsenz</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})yes(?:-log)?$">
-      <example>4.0.27yes</example>
-      <description>Oracle MySQL part of KB2 / Kimsboard (Korean site mgmt)?</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-   </fingerprint>
-
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})\.t\d{1,2}(?:-log)?$">
-      <example>5.5.24.t7-log</example>
-      <description>Oracle MySQL audited/published by Twitter</description>
-      <param pos="1" name="service.version"/>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL"/>
-   </fingerprint>
-
-   <fingerprint pattern="^#07000Proxy Warning - IP Forbidden$">
-      <example>#07000Proxy Warning - IP Forbidden</example>
-      <description>Oracle MySQL Proxy - Error: Host not allowed to connect</description>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL Proxy"/>
-   </fingerprint>
-
-   <fingerprint pattern="^\(proxy\) all backends are down$">
-      <example>(proxy) all backends are down</example>
-      <description>Oracle MySQL Proxy - Error: Backends down</description>
-      <param pos="0" name="service.vendor" value="Oracle"/>
-      <param pos="0" name="service.family" value="MySQL"/>
-      <param pos="0" name="service.product" value="MySQL Proxy"/>
-   </fingerprint>
+
+  <fingerprint pattern="^(?:#HY000)?Host '[^']+' is not allowed to connect to this MySQL server$">
+    <example>Host '10.10.10.10' is not allowed to connect to this MySQL server</example>
+    <example>#HY000Host '10.10.10.10' is not allowed to connect to this MySQL server</example>
+    <description>Oracle MySQL - Error: Host not allowed to connect (English)</description>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Le h.te '[^']+' n'est pas authoris. . se connecter . ce serveur MySQL$">
+    <example>Le h�te '10.10.10.10' n'est pas authoris� � se connecter � ce serveur MySQL</example>
+    <description>Oracle MySQL - Error: Host not allowed to connect (French)</description>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^'Host' '[^']+' n.o tem permiss.o para se conectar com este servidor MySQL$">
+    <example>'Host' '10.10.10.10' n�o tem permiss�o para se conectar com este servidor MySQL</example>
+    <description>Oracle MySQL - Error: Host not allowed to connect (Spanish)</description>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Host.+?hat keine Berechtigung,.+?diesem MySQL">
+    <example>Host '10.10.10.10' hat keine Berechtigung, sich mit diesem MySQL-Server zu verbinden</example>
+    <example>Host hat keine Berechtigung, eine Verbindung zu diesem MySQL Server herzustellen.</example>
+    <description>Oracle MySQL - Error: Host not allowed to connect (German)</description>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(?:#HY000)?Host '[^']+' is blocked because of many connection errors.\s{1,2}[Uu]nblock with 'mysqladmin flush-hosts'$">
+    <example>Host '10.10.10.10' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'</example>
+    <example>Host '10.10.10.10' is blocked because of many connection errors.  Unblock with 'mysqladmin flush-hosts'</example>
+    <description>Oracle MySQL - Error: Blocked, too many errors from this host</description>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Host.+?blockiert wegen zu vieler Verbindungsfehler. Aufheben der Blockierung mit 'mysqladmin flush-hosts'">
+    <example>Host blockiert wegen zu vieler Verbindungsfehler. Aufheben der Blockierung mit 'mysqladmin flush-hosts'.</example>
+    <example>Host '10.10.10.10' blockiert wegen zu vieler Verbindungsfehler. Aufheben der Blockierung mit 'mysqladmin flush-hosts'</example>
+    <description>Oracle MySQL - Error: Blocked, too many errors from this host (German)</description>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Host '[^']+' is not allowed to connect to this MariaDB server$">
+    <example>Host '10.10.10.10' is not allowed to connect to this MariaDB server</example>
+    <description>MariaDB MariaDB - Error: Host not allowed to connect (English) </description>
+    <param pos="0" name="service.vendor" value="MariaDB"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MariaDB"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Can't create a new thread \(errno -?[12]{1,2}\)">
+    <example>Can't create a new thread (errno -1); if you are not out of available memory, you can consult the manual for a possible OS-dependent bug</example>
+    <example>Can't create a new thread (errno 12); if you are not out of available memory, you can consult the manual for a possible OS-dependent bug</example>
+    <description>Oracle MySQL - Error: Out of memory</description>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Too many connections$">
+    <example>Too many connections</example>
+    <description>Oracle MySQL - Error: Too many connections</description>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Can't get hostname for your address$">
+    <example>Can't get hostname for your address</example>
+    <description>Oracle MySQL - Error: Unable to resolve client hostname</description>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <!-- Standard Banner Matches -->
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}(?:[.-]\d{1,2})?)(?:-m\d{1,2})?(?:-rc)?(?:-alpha)?(?:-beta)?(?:-gamma)?(?:-?[Mm]ax)?(?:-rs)?(?:-modified)?(?:-debug)?(?:-log)?$">
+    <example service.version="4.1.20">4.1.20</example>
+    <example service.version="5.5.23-55">5.5.23-55</example>
+    <example service.version="5.5.18.1">5.5.18.1-log</example>
+    <example service.version="5.7.4">5.7.4-m14</example>
+    <example service.version="5.0.95">5.0.95-rs</example>
+    <example service.version="5.1.65">5.1.65-log</example>
+    <example service.version="5.4.1">5.4.1-beta-log</example>
+    <example service.version="4.1.13">4.1.13-Max-log</example>
+    <example service.version="5.1.33">5.1.33max-log</example>
+    <example service.version="5.0.87">5.0.87-modified-log</example>
+    <example service.version="5.5.3">5.5.3-m3-log</example>
+    <example service.version="4.0.20a">4.0.20a-debug</example>
+    <example service.version="5.1.37">5.1.37-debug-log</example>
+    <description>Oracle MySQL (common)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:-alpha)?(?:-beta)?(?:-rc)?-community(?:-max)?-nt(?:-log)?(?:-debug)?(?:-log)?$">
+    <example service.version="4.1.22">4.1.22-community-max-nt</example>
+    <example service.version="5.0.88">5.0.88-community-nt</example>
+    <example service.version="5.0.67">5.0.67-community-nt-log</example>
+    <example service.version="5.1.20">5.1.20-beta-community-nt-debug</example>
+    <example service.version="6.0.0">6.0.0-alpha-community-nt-debug</example>
+    <example service.version="6.0.2">6.0.2-alpha-community-nt-debug-log</example>
+    <description>Oracle MySQL Community Edition with Named Pipes (Windows)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="service.edition" value="Community Edition"/>
+    <param pos="0" name="os.vendor" value="Microsoft"/>
+    <param pos="0" name="os.device" value="General"/>
+    <param pos="0" name="os.family" value="Windows"/>
+    <param pos="0" name="os.product" value="Windows"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:-m\d)?(?:-rc)?(?:-alpha)?(?:-beta)?-[Cc]ommunity(?:-max)?(?:-debug)?(?:-log)?(?:-debug)?$">
+    <example>5.0.95-community-log</example>
+    <example>5.0.37-Community-log</example>
+    <example>5.0.21-community-max</example>
+    <example>5.5.0-m2-community-log</example>
+    <example>6.0.4-alpha-community</example>
+    <example>5.1.33-community-debug</example>
+    <example>5.5.0-m2-community-debug-log</example>
+    <description>Oracle MySQL Community Edition</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="service.edition" value="Community Edition"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:-alpha)?(?:-beta)?(?:-rc)?(?:-gamma)?(?:-max)?-nt(?:-max)?(?:-log)?$">
+    <example>5.0.18-nt</example>
+    <example>4.1.12a-nt-max-log</example>
+    <example>3.23.58-max-nt</example>
+    <example>5.1.6-alpha-nt-max</example>
+    <example>4.0.11-gamma-max-nt</example>
+    <description>Oracle MySQL with Named Pipes (Windows)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="os.vendor" value="Microsoft"/>
+    <param pos="0" name="os.device" value="General"/>
+    <param pos="0" name="os.family" value="Windows"/>
+    <param pos="0" name="os.product" value="Windows"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-cll$">
+    <example service.version="5.5.25a">5.5.25a-cll</example>
+    <description>Oracle MySQL hosted on CPanel</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="os.device" value="General"/>
+    <param pos="0" name="os.family" value="Linux"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-community-cll$">
+    <example service.version="5.0.91">5.0.91-community-cll</example>
+    <description>Oracle MySQL Community hosted on CPanel</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="service.edition" value="Community Edition"/>
+    <param pos="0" name="os.device" value="General"/>
+    <param pos="0" name="os.family" value="Linux"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-cll-lve$">
+    <example service.version="5.1.66">5.1.66-cll-lve</example>
+    <description>Oracle MySQL on CloudLinux in a Lightweight Virtual Environment (LVE)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="os.vendor" value="CloudLinux"/>
+    <param pos="0" name="os.device" value="General"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-community-cll-lve$">
+    <example>5.0.95-community-cll-lve</example>
+    <description>Oracle MySQL Community on CloudLinux in a Lightweight Virtual Environment (LVE)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="service.edition" value="Community Edition"/>
+    <param pos="0" name="os.vendor" value="CloudLinux"/>
+    <param pos="0" name="os.device" value="General"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})-0ubuntu0.(\d\d\.\d\d)">
+    <example>5.1.66-0ubuntu0.10.04.3-log</example>
+    <example>5.5.28-0ubuntu0.12.04.3-log</example>
+    <description>Oracle MySQL on Ubuntu</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="os.vendor" value="Ubuntu"/>
+    <param pos="0" name="os.device" value="General"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="2" name="os.version"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})-(?:Debian_)?\dubuntu(\d{1,2}\.\d\d)">
+    <example>5.0.22-Debian_0ubuntu6.06.14-log</example>
+    <example>5.1.41-3ubuntu12.10</example>
+    <description>Oracle MySQL on Ubuntu</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="os.vendor" value="Ubuntu"/>
+    <param pos="0" name="os.device" value="General"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="2" name="os.version"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})[-_](?:Ubuntu[_-])?(?:Debian[_-])?\d{1,2}(?:~exp1)?ubuntu\d{1,2}(?:\.\d)?(?:-log)?$">
+    <example service.version="5.0.45">5.0.45-Debian_1ubuntu3.4</example>
+    <example service.version="5.0.51a">5.0.51a-3ubuntu5.5</example>
+    <example service.version="5.0.51a">5.0.51a-3ubuntu5.8-log</example>
+    <example service.version="5.0.75">5.0.75-0ubuntu10.2</example>
+    <example service.version="5.1.58">5.1.58-1ubuntu1</example>
+    <example service.version="4.0.24">4.0.24_Debian-10ubuntu2-log</example>
+    <example service.version="5.6.19">5.6.19-1~exp1ubuntu2-log</example>
+    <description>Oracle MySQL on Ubuntu where trailing digits aren't OS version</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="os.vendor" value="Ubuntu"/>
+    <param pos="0" name="os.device" value="General"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.[^+]+)\+deb\.sury\.org~precise\+\d(?:-log)?$">
+    <example service.version="5.6.19-1">5.6.19-1+deb.sury.org~precise+1</example>
+    <example service.version="5.6.20-1">5.6.20-1+deb.sury.org~precise+1-log</example>
+    <description>Oracle MySQL on Ubuntu 12.04 (Precise Pangolin) packaged by deb.sury.org</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="os.vendor" value="Ubuntu"/>
+    <param pos="0" name="os.device" value="General"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="12.04"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.[^+]+)\+deb\.sury\.org~trusty\+\d(?:-log)?$">
+    <example service.version="5.6.21-1">5.6.21-1+deb.sury.org~trusty+1</example>
+    <example service.version="5.6.19-1">5.6.19-1+deb.sury.org~trusty+1-log</example>
+    <description>Oracle MySQL on Ubuntu 14.04 (Trusty Tahr) packaged by deb.sury.org</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="os.vendor" value="Ubuntu"/>
+    <param pos="0" name="os.device" value="General"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="14.04"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.[^+]+)\+(?:squeeze\d|deb6u1)(?:-log)?$">
+    <example service.version="5.1.66-0">5.1.66-0+squeeze1</example>
+    <example service.version="5.1.66-0">5.1.66-0+squeeze1-log</example>
+    <example service.version="5.1.73-1">5.1.73-1+deb6u1</example>
+    <description>Oracle MySQL on Debian 6.0 (squeeze)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="os.vendor" value="Debian"/>
+    <param pos="0" name="os.device" value="General"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="6.0"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.[^+]+)\+wheezy\d(?:-log)?$">
+    <example service.version="5.5.41-0">5.5.41-0+wheezy1</example>
+    <example service.version="5.5.35-0">5.5.35-0+wheezy1-log</example>
+    <description>Oracle MySQL on Debian 7.0 (wheezy)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="os.vendor" value="Debian"/>
+    <param pos="0" name="os.device" value="General"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="7.0"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.[^+]+)\+lenny">
+    <example>5.0.51a-24+lenny1-log</example>
+    <example>5.0.51a-24+lenny2</example>
+    <description>Oracle MySQL on Debian 5.0 (lenny)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="os.vendor" value="Debian"/>
+    <param pos="0" name="os.device" value="General"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="5.0"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-\d~bpo50">
+    <example>5.1.49-3~bpo50+1-log</example>
+    <description>Oracle MySQL Backport on Debian 5.0 (lenny)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="os.vendor" value="Debian"/>
+    <param pos="0" name="os.device" value="General"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="5.0"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-Debian_\d~?bpo\.?\d">
+    <example>5.0.22-Debian_2bpo1</example>
+    <example>5.0.32-Debian_7~bpo.1-log</example>
+    <description>Oracle MySQL Backport on Debian</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="os.vendor" value="Debian"/>
+    <param pos="0" name="os.device" value="General"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})-Debian_\d?etch\d">
+    <example>4.1.11-Debian_etch1-log</example>
+    <example>5.0.32-Debian_7etch6-log</example>
+    <description>Oracle MySQL on Debian 4.0 (etch)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="os.vendor" value="Debian"/>
+    <param pos="0" name="os.device" value="General"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="4.0"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})[_-]Debian[_-]\d{1,2}sarge\d">
+    <example>4.0.24_Debian-10sarge2-log</example>
+    <example>4.1.11-Debian_4sarge7-log</example>
+    <description>Oracle MySQL on Debian 3.1 (sarge)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="os.vendor" value="Debian"/>
+    <param pos="0" name="os.device" value="General"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="3.1"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})[_-]Debian[_-]\d{1,2}woody\d">
+    <example service.version="4.0.24">4.0.24_Debian-4woody1</example>
+    <description>Oracle MySQL on Debian 3.0 (woody)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="os.vendor" value="Debian"/>
+    <param pos="0" name="os.device" value="General"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="3.0"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:[_-]\d{8})?[_-]Debian[_-]\d{1,2}(?:-log)?$">
+    <example>4.0.23_Debian-3-log</example>
+    <example>4.0.31-20070605_Debian-7-log</example>
+    <description>Oracle MySQL on Debian (Generic match)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="os.vendor" value="Debian"/>
+    <param pos="0" name="os.device" value="General"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})(?:-rc)?[_-]Debian[_-]\d{1,2}~ppa\d(?:-log)?$">
+    <example>5.1.22-rc-Debian_2~ppa5-log</example>
+    <description>Oracle MySQL on Debian (Generic match) using PPA</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="os.vendor" value="Debian"/>
+    <param pos="0" name="os.device" value="General"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}(?:-\d{1,2})?)(?:-Debian)?(?:-Dotdeb)?[-~_\d\.]+dotdeb\.\d(?:-log)?$">
+    <example>5.1.54-0.dotdeb.0</example>
+    <example>5.1.58-1~dotdeb.0</example>
+    <example>5.5.30-1~dotdeb.0-log</example>
+    <example>5.1.30-Dotdeb_0.dotdeb.0-log</example>
+    <description>Oracle MySQL packaged by DotDeb.org</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="os.vendor" value="Debian"/>
+    <param pos="0" name="os.device" value="General"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:-alpha)?(?:-beta)?(?:-gamma)?(?:-rc)?-standard(?:-log)?$">
+    <example>5.0.13-rc-standard-log</example>
+    <example>5.0.37-standard</example>
+    <example>5.0.51a-standard-log</example>
+    <description>Oracle MySQL Standard Edition</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="service.edition" value="Standard Edition"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-pro(?:-gpl)?-nt(?:-log)?$">
+    <example>5.0.24-pro-nt</example>
+    <example>4.1.25-pro-gpl-nt-log</example>
+    <description>Oracle MySQL Commercial Edition with Named Pipes (Windows)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="service.edition" value="Commercial Edition"/>
+    <param pos="0" name="os.vendor" value="Microsoft"/>
+    <param pos="0" name="os.device" value="General"/>
+    <param pos="0" name="os.family" value="Windows"/>
+    <param pos="0" name="os.product" value="Windows"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-pro(?:-gpl)?(?:-log)?">
+    <example>4.1.23-pro-gpl-log</example>
+    <example>5.0.17c-pro-gpl-cert</example>
+    <description>Oracle MySQL Commercial Edition</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="service.edition" value="Commercial Edition"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}sp1)">
+    <example>5.0.82sp1</example>
+    <example>5.1.46sp1-enterprise-gpl-advanced-log</example>
+    <description>Oracle MySQL Enterprise Edition</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="service.edition" value="Enterprise Edition"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-enterprise-nt">
+    <example>5.0.84-enterprise-nt</example>
+    <description>Oracle MySQL Enterprise Edition with Named Pipes (Windows)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="service.edition" value="Enterprise Edition"/>
+    <param pos="0" name="os.vendor" value="Microsoft"/>
+    <param pos="0" name="os.device" value="General"/>
+    <param pos="0" name="os.family" value="Windows"/>
+    <param pos="0" name="os.product" value="Windows"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:-rc)?-enterprise">
+    <example>5.1.26-rc-enterprise-gpl-log</example>
+    <example>5.5.27-enterprise-commercial-advanced-log</example>
+    <description>Oracle MySQL Enterprise Edition</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="service.edition" value="Enterprise Edition"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}-ndb-\d\.\d{1,2}\.\h{1,3})">
+    <example>5.1.30-ndb-6.3.20-cluster-gpl-log</example>
+    <example>5.5.20-ndb-7.2.5-gpl</example>
+    <description>Oracle MySQL Cluster Edition</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="service.edition" value="Cluster Edition"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-CLUSTERS?(?:-log)?$" flags="REG_ICASE">
+    <example>4.1.21-CLUSTERS</example>
+    <example>5.0.46-cluster</example>
+    <description>Oracle MySQL Cluster Edition</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="service.edition" value="Cluster Edition"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-classic(?:-log)?">
+    <example>5.0.86-classic-log</example>
+    <description>Oracle MySQL Classic Edition</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="service.edition" value="Classic Edition"/>
+  </fingerprint>
+
+  <!-- Linux only - http://www.percona.com/services/mysql-support/supported-platforms -->
+  <!-- Build list - http://www.percona.com/doc/percona-server/5.1/release-notes/release-notes_index.html -->
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}-?rel\d\d\.\d)(?:-log)?">
+    <example>5.1.57-rel12.8</example>
+    <example>5.1.60rel13.1-log</example>
+    <example>5.1.67-rel14.3-log</example>
+    <description>Percona Server (MySQL fork)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Percona"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="Percona Server"/>
+    <param pos="0" name="os.device" value="General"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}-\d\d\.\d)">
+    <example>5.5.28-29.3-log</example>
+    <description>Percona Server (MySQL fork)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Percona"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="Percona Server"/>
+    <param pos="0" name="os.device" value="General"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-(?:rc)?[Pp]ercona">
+    <example>5.1.50-percona</example>      
+    <example>5.5.27-percona-sure1-log</example>
+    <example>5.5.7-rcPercona-Server-log</example>
+    <description>Percona Server (MySQL fork)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Percona"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="Percona Server"/>
+    <param pos="0" name="os.device" value="General"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-nmm">
+    <example>4.0.27-nmm1-log</example>
+    <example>4.1.22-nmm-1-log</example>
+    <description>Oracle MySQL (nmm variant)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-nightly-\d{8}(?:-log)?$">
+    <example>3.23.59-nightly-20050301-log</example>
+    <description>Oracle MySQL nightly build</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-SERVER">
+    <example>5.1.30-SERVER-104</example>
+    <description>Oracle MySQL (SERVER variant)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-ISPrime">
+    <example>4.0.15a-ISPrime</example>
+    <description>Oracle MySQL (ISPrime variant)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-rc-\d\.\d{1,2}\.\h{1,3}">
+    <example>5.1.26-rc-5.1.26rc-log</example>
+    <description>Oracle MySQL possibly Debian specific</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-ius(?:-log)?$">
+    <example>5.1.66-ius-log</example>
+    <description>Oracle MySQL packaged for RHEL/CentOS by IUS</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="os.device" value="General"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})[\.-]d\d{1,2}-ourdelta\d{0,2}(?:-log)?$">
+    <example>5.0.67.d7-ourdelta-log</example>
+    <example>5.0.87-d10-ourdelta65-log</example>
+    <description>Oracle MySQL tweaked and packaged by OurDelta</description>
+    <!-- They also have a MariaDB based one based on 5.1 -->
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="os.device" value="General"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-Alibaba(?:-rds)?-\d{6}(?:-log)?$">
+    <example service.version="5.1.61">5.1.61-Alibaba-121011-log</example>
+    <example service.version="5.1.61">5.1.61-Alibaba-rds-201404-log</example>
+    <description>Oracle MySQL Alibaba build? distro? Aliyun.com hosted?</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-MariaDB.+~lenny(?:-log)?$">
+    <example>5.3.2-MariaDB-beta-mariadb102~lenny</example>
+    <description>MariaDB MariaDB on Debian Lenny</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="MariaDB"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MariaDB"/>
+    <param pos="0" name="os.vendor" value="Debian"/>
+    <param pos="0" name="os.device" value="General"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="5.0"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-[Mm]aria">
+    <example service.version="5.1.39">5.1.39-maria-beta</example>
+    <example service.version="5.5.24">5.5.24-MariaDB-mariadb1~0.1</example>
+    <description>MariaDB MariaDB</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="MariaDB"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MariaDB"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-falcon-alpha-community-nt">
+    <example service.version="5.2.0">5.2.0-falcon-alpha-community-nt</example>
+    <description>Oracle MySQL with defunct Falcon Storage Engine with Named Pipes (Windows)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="os.vendor" value="Microsoft"/>
+    <param pos="0" name="os.device" value="General"/>
+    <param pos="0" name="os.family" value="Windows"/>
+    <param pos="0" name="os.product" value="Windows"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-falcon-alpha(?:-log)?$">
+    <example service.version="5.2.0">5.2.0-falcon-alpha-log</example>
+    <description>Oracle MySQL with defunct Falcon Storage Engine</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-tokudb-.*MariaDB(?:-log)?$">
+    <example>5.5.25-tokudb-6.1.1-47477-MariaDB-log</example>
+    <description>Tokutek customized MariaDB</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Tokutek"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MariaDB"/>
+  </fingerprint>
+
+  <fingerprint pattern="^^(\d\.\d{1,2}\.\h{1,3})-Sphinx">
+    <example>5.1.40-Sphinx</example>
+    <description>Oracle MySQL with the Sphinx full text search engine</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:[^+]+)?\+tld\d">
+    <example>5.0.91+tld0-log</example>
+    <example>5.1.57-5.1.57+tld2-log</example>
+    <description>Oracle MySQL packaged by TLD Linux</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="os.vendor" value="TLD"/>
+    <param pos="0" name="os.device" value="General"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-Debian_\d\.infrant\d$">
+    <example>5.0.24a-Debian_3.infrant1</example>
+    <description>Oracle MySQL on a Netgear ReadyNAS</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="os.vendor" value="Debian"/>
+    <param pos="0" name="os.device" value="General"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="hw.vendor" value="Netgear"/>
+    <param pos="0" name="hw.device" value="General"/>
+    <param pos="0" name="hw.family" value="ReadyNAS"/>
+    <param pos="0" name="hw.product" value="ReadyNAS"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-beget(?:-log)?$">
+    <example>5.1.61-beget-log</example>
+    <description>Oracle MySQL at Ukrainian hoster BeGet(?)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-(?:Linuxtone.Org|LTOPS)(?:-log)?$">
+    <example>5.0.56-Linuxtone.Org</example>
+    <example>5.1.53-LTOPS-log</example>
+    <description>Oracle MySQL at Chinese hoster Linuxtone.org</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-xencdn.net(?:-log)?$">
+    <example>5.1.66-xencdn.net-log</example>
+    <description>Oracle MySQL at Chinese hoster Xencdn.net</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-Comsenz(?:-log)?$">
+    <example>5.0.27-Comsenz-log</example>
+    <description>Oracle MySQL at Chinese hoster Comsenz</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})yes(?:-log)?$">
+    <example>4.0.27yes</example>
+    <description>Oracle MySQL part of KB2 / Kimsboard (Korean site mgmt)?</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})\.t\d{1,2}(?:-log)?$">
+    <example>5.5.24.t7-log</example>
+    <description>Oracle MySQL audited/published by Twitter</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^#07000Proxy Warning - IP Forbidden$">
+    <example>#07000Proxy Warning - IP Forbidden</example>
+    <description>Oracle MySQL Proxy - Error: Host not allowed to connect</description>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL Proxy"/>
+  </fingerprint>
+
+  <fingerprint pattern="^\(proxy\) all backends are down$">
+    <example>(proxy) all backends are down</example>
+    <description>Oracle MySQL Proxy - Error: Backends down</description>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL Proxy"/>
+  </fingerprint>
 </fingerprints>

From 3d7d947eb51396f7dd75749af7c152dd276ab91b Mon Sep 17 00:00:00 2001
From: Tom Sellers <tom@fadedcode.net>
Date: Tue, 24 Feb 2015 05:53:40 -0600
Subject: [PATCH 05/14] Addressed most of @jhart-r7 's issues

- Added example lines
- Removed the os.device and os.product entries as requested

Pending

- Community vs commmunity metrics
- Base generic regex for MySQL versions not matched so far
- fingerprint optimization based on sample data
- reviewing use of trailing terminator for regex
---
 xml/mysql_banners.xml | 200 +++++++++++++++++-------------------------
 1 file changed, 81 insertions(+), 119 deletions(-)

diff --git a/xml/mysql_banners.xml b/xml/mysql_banners.xml
index fe56061e..5cb7a867 100644
--- a/xml/mysql_banners.xml
+++ b/xml/mysql_banners.xml
@@ -124,19 +124,17 @@
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="service.edition" value="Community Edition"/>
     <param pos="0" name="os.vendor" value="Microsoft"/>
-    <param pos="0" name="os.device" value="General"/>
     <param pos="0" name="os.family" value="Windows"/>
-    <param pos="0" name="os.product" value="Windows"/>
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:-m\d)?(?:-rc)?(?:-alpha)?(?:-beta)?-[Cc]ommunity(?:-max)?(?:-debug)?(?:-log)?(?:-debug)?$">
-    <example>5.0.95-community-log</example>
-    <example>5.0.37-Community-log</example>
-    <example>5.0.21-community-max</example>
-    <example>5.5.0-m2-community-log</example>
-    <example>6.0.4-alpha-community</example>
-    <example>5.1.33-community-debug</example>
-    <example>5.5.0-m2-community-debug-log</example>
+    <example service.version="5.0.95">5.0.95-community-log</example>
+    <example service.version="5.0.37">5.0.37-Community-log</example>
+    <example service.version="5.0.21">5.0.21-community-max</example>
+    <example service.version="5.5.0">5.5.0-m2-community-log</example>
+    <example service.version="6.0.4">6.0.4-alpha-community</example>
+    <example service.version="5.1.33">5.1.33-community-debug</example>
+    <example service.version="5.5.0">5.5.0-m2-community-debug-log</example>
     <description>Oracle MySQL Community Edition</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
@@ -146,20 +144,18 @@
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:-alpha)?(?:-beta)?(?:-rc)?(?:-gamma)?(?:-max)?-nt(?:-max)?(?:-log)?$">
-    <example>5.0.18-nt</example>
-    <example>4.1.12a-nt-max-log</example>
-    <example>3.23.58-max-nt</example>
-    <example>5.1.6-alpha-nt-max</example>
-    <example>4.0.11-gamma-max-nt</example>
+    <example service.version="5.0.18">5.0.18-nt</example>
+    <example service.version="4.1.12a">4.1.12a-nt-max-log</example>
+    <example service.version="3.23.58">3.23.58-max-nt</example>
+    <example service.version="5.1.6">5.1.6-alpha-nt-max</example>
+    <example service.version="4.0.11">4.0.11-gamma-max-nt</example>
     <description>Oracle MySQL with Named Pipes (Windows)</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="os.vendor" value="Microsoft"/>
-    <param pos="0" name="os.device" value="General"/>
     <param pos="0" name="os.family" value="Windows"/>
-    <param pos="0" name="os.product" value="Windows"/>
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-cll$">
@@ -169,7 +165,6 @@
     <param pos="0" name="service.vendor" value="Oracle"/>
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MySQL"/>
-    <param pos="0" name="os.device" value="General"/>
     <param pos="0" name="os.family" value="Linux"/>
   </fingerprint>
 
@@ -181,7 +176,6 @@
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="service.edition" value="Community Edition"/>
-    <param pos="0" name="os.device" value="General"/>
     <param pos="0" name="os.family" value="Linux"/>
   </fingerprint>
 
@@ -193,13 +187,12 @@
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="os.vendor" value="CloudLinux"/>
-    <param pos="0" name="os.device" value="General"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-community-cll-lve$">
-    <example>5.0.95-community-cll-lve</example>
+    <example service.version="5.0.95">5.0.95-community-cll-lve</example>
     <description>Oracle MySQL Community on CloudLinux in a Lightweight Virtual Environment (LVE)</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
@@ -207,36 +200,33 @@
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="service.edition" value="Community Edition"/>
     <param pos="0" name="os.vendor" value="CloudLinux"/>
-    <param pos="0" name="os.device" value="General"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})-0ubuntu0.(\d\d\.\d\d)">
-    <example>5.1.66-0ubuntu0.10.04.3-log</example>
-    <example>5.5.28-0ubuntu0.12.04.3-log</example>
+    <example service.version="5.1.66">5.1.66-0ubuntu0.10.04.3-log</example>
+    <example service.version="5.5.28">5.5.28-0ubuntu0.12.04.3-log</example>
     <description>Oracle MySQL on Ubuntu</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="os.vendor" value="Ubuntu"/>
-    <param pos="0" name="os.device" value="General"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="2" name="os.version"/>
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})-(?:Debian_)?\dubuntu(\d{1,2}\.\d\d)">
-    <example>5.0.22-Debian_0ubuntu6.06.14-log</example>
-    <example>5.1.41-3ubuntu12.10</example>
+    <example service.version="5.0.22">5.0.22-Debian_0ubuntu6.06.14-log</example>
+    <example service.version="5.1.41">5.1.41-3ubuntu12.10</example>
     <description>Oracle MySQL on Ubuntu</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="os.vendor" value="Ubuntu"/>
-    <param pos="0" name="os.device" value="General"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="2" name="os.version"/>
@@ -256,7 +246,6 @@
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="os.vendor" value="Ubuntu"/>
-    <param pos="0" name="os.device" value="General"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
@@ -270,7 +259,6 @@
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="os.vendor" value="Ubuntu"/>
-    <param pos="0" name="os.device" value="General"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.version" value="12.04"/>
@@ -285,7 +273,6 @@
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="os.vendor" value="Ubuntu"/>
-    <param pos="0" name="os.device" value="General"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.version" value="14.04"/>
@@ -301,7 +288,6 @@
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="os.vendor" value="Debian"/>
-    <param pos="0" name="os.device" value="General"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.version" value="6.0"/>
@@ -316,80 +302,74 @@
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="os.vendor" value="Debian"/>
-    <param pos="0" name="os.device" value="General"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.version" value="7.0"/>
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.[^+]+)\+lenny">
-    <example>5.0.51a-24+lenny1-log</example>
-    <example>5.0.51a-24+lenny2</example>
+    <example service.version="5.0.51a-24">5.0.51a-24+lenny1-log</example>
+    <example service.version="5.0.51a-24">5.0.51a-24+lenny2</example>
     <description>Oracle MySQL on Debian 5.0 (lenny)</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="os.vendor" value="Debian"/>
-    <param pos="0" name="os.device" value="General"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.version" value="5.0"/>
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-\d~bpo50">
-    <example>5.1.49-3~bpo50+1-log</example>
+    <example service.version="5.1.49">5.1.49-3~bpo50+1-log</example>
     <description>Oracle MySQL Backport on Debian 5.0 (lenny)</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="os.vendor" value="Debian"/>
-    <param pos="0" name="os.device" value="General"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.version" value="5.0"/>
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-Debian_\d~?bpo\.?\d">
-    <example>5.0.22-Debian_2bpo1</example>
-    <example>5.0.32-Debian_7~bpo.1-log</example>
+    <example service.version="5.0.22">5.0.22-Debian_2bpo1</example>
+    <example service.version="5.0.32">5.0.32-Debian_7~bpo.1-log</example>
     <description>Oracle MySQL Backport on Debian</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="os.vendor" value="Debian"/>
-    <param pos="0" name="os.device" value="General"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})-Debian_\d?etch\d">
-    <example>4.1.11-Debian_etch1-log</example>
-    <example>5.0.32-Debian_7etch6-log</example>
+    <example service.version="4.1.11">4.1.11-Debian_etch1-log</example>
+    <example service.version="5.0.32">5.0.32-Debian_7etch6-log</example>
     <description>Oracle MySQL on Debian 4.0 (etch)</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="os.vendor" value="Debian"/>
-    <param pos="0" name="os.device" value="General"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.version" value="4.0"/>
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})[_-]Debian[_-]\d{1,2}sarge\d">
-    <example>4.0.24_Debian-10sarge2-log</example>
-    <example>4.1.11-Debian_4sarge7-log</example>
+    <example service.version="4.0.24">4.0.24_Debian-10sarge2-log</example>
+    <example service.version="4.1.11">4.1.11-Debian_4sarge7-log</example>
     <description>Oracle MySQL on Debian 3.1 (sarge)</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="os.vendor" value="Debian"/>
-    <param pos="0" name="os.device" value="General"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.version" value="3.1"/>
@@ -403,59 +383,55 @@
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="os.vendor" value="Debian"/>
-    <param pos="0" name="os.device" value="General"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.version" value="3.0"/>
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:[_-]\d{8})?[_-]Debian[_-]\d{1,2}(?:-log)?$">
-    <example>4.0.23_Debian-3-log</example>
-    <example>4.0.31-20070605_Debian-7-log</example>
+    <example service.version="4.0.23">4.0.23_Debian-3-log</example>
+    <example service.version="4.0.31">4.0.31-20070605_Debian-7-log</example>
     <description>Oracle MySQL on Debian (Generic match)</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="os.vendor" value="Debian"/>
-    <param pos="0" name="os.device" value="General"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})(?:-rc)?[_-]Debian[_-]\d{1,2}~ppa\d(?:-log)?$">
-    <example>5.1.22-rc-Debian_2~ppa5-log</example>
+    <example service.version="5.1.22">5.1.22-rc-Debian_2~ppa5-log</example>
     <description>Oracle MySQL on Debian (Generic match) using PPA</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="os.vendor" value="Debian"/>
-    <param pos="0" name="os.device" value="General"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}(?:-\d{1,2})?)(?:-Debian)?(?:-Dotdeb)?[-~_\d\.]+dotdeb\.\d(?:-log)?$">
-    <example>5.1.54-0.dotdeb.0</example>
-    <example>5.1.58-1~dotdeb.0</example>
-    <example>5.5.30-1~dotdeb.0-log</example>
-    <example>5.1.30-Dotdeb_0.dotdeb.0-log</example>
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:-\d{1,2})?(?:-Debian)?(?:-Dotdeb)?[-~_\d\.]+dotdeb\.\d(?:-log)?$">
+    <example service.version="5.1.54">5.1.54-0.dotdeb.0</example>
+    <example service.version="5.1.58">5.1.58-1~dotdeb.0</example>
+    <example service.version="5.5.30">5.5.30-1~dotdeb.0-log</example>
+    <example service.version="5.1.30">5.1.30-Dotdeb_0.dotdeb.0-log</example>
     <description>Oracle MySQL packaged by DotDeb.org</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="os.vendor" value="Debian"/>
-    <param pos="0" name="os.device" value="General"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:-alpha)?(?:-beta)?(?:-gamma)?(?:-rc)?-standard(?:-log)?$">
-    <example>5.0.13-rc-standard-log</example>
-    <example>5.0.37-standard</example>
-    <example>5.0.51a-standard-log</example>
+    <example service.version="5.0.13">5.0.13-rc-standard-log</example>
+    <example service.version="5.0.37">5.0.37-standard</example>
+    <example service.version="5.0.51a">5.0.51a-standard-log</example>
     <description>Oracle MySQL Standard Edition</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
@@ -465,8 +441,8 @@
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-pro(?:-gpl)?-nt(?:-log)?$">
-    <example>5.0.24-pro-nt</example>
-    <example>4.1.25-pro-gpl-nt-log</example>
+    <example service.version="5.0.24">5.0.24-pro-nt</example>
+    <example service.version="4.1.25">4.1.25-pro-gpl-nt-log</example>
     <description>Oracle MySQL Commercial Edition with Named Pipes (Windows)</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
@@ -474,14 +450,12 @@
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="service.edition" value="Commercial Edition"/>
     <param pos="0" name="os.vendor" value="Microsoft"/>
-    <param pos="0" name="os.device" value="General"/>
     <param pos="0" name="os.family" value="Windows"/>
-    <param pos="0" name="os.product" value="Windows"/>
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-pro(?:-gpl)?(?:-log)?">
-    <example>4.1.23-pro-gpl-log</example>
-    <example>5.0.17c-pro-gpl-cert</example>
+    <example service.version="4.1.23">4.1.23-pro-gpl-log</example>
+    <example service.version="5.0.17c">5.0.17c-pro-gpl-cert</example>
     <description>Oracle MySQL Commercial Edition</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
@@ -491,8 +465,8 @@
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}sp1)">
-    <example>5.0.82sp1</example>
-    <example>5.1.46sp1-enterprise-gpl-advanced-log</example>
+    <example service.version="5.0.82sp1">5.0.82sp1</example>
+    <example service.version="5.1.46sp1">5.1.46sp1-enterprise-gpl-advanced-log</example>
     <description>Oracle MySQL Enterprise Edition</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
@@ -502,7 +476,7 @@
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-enterprise-nt">
-    <example>5.0.84-enterprise-nt</example>
+    <example service.version="5.0.84">5.0.84-enterprise-nt</example>
     <description>Oracle MySQL Enterprise Edition with Named Pipes (Windows)</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
@@ -510,14 +484,12 @@
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="service.edition" value="Enterprise Edition"/>
     <param pos="0" name="os.vendor" value="Microsoft"/>
-    <param pos="0" name="os.device" value="General"/>
     <param pos="0" name="os.family" value="Windows"/>
-    <param pos="0" name="os.product" value="Windows"/>
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:-rc)?-enterprise">
-    <example>5.1.26-rc-enterprise-gpl-log</example>
-    <example>5.5.27-enterprise-commercial-advanced-log</example>
+    <example service.version="5.1.26">5.1.26-rc-enterprise-gpl-log</example>
+    <example service.version="5.5.27">5.5.27-enterprise-commercial-advanced-log</example>
     <description>Oracle MySQL Enterprise Edition</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
@@ -527,8 +499,8 @@
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}-ndb-\d\.\d{1,2}\.\h{1,3})">
-    <example>5.1.30-ndb-6.3.20-cluster-gpl-log</example>
-    <example>5.5.20-ndb-7.2.5-gpl</example>
+    <example service.version="5.1.30-ndb-6.3.20">5.1.30-ndb-6.3.20-cluster-gpl-log</example>
+    <example service.version="5.5.20-ndb-7.2.5">5.5.20-ndb-7.2.5-gpl</example>
     <description>Oracle MySQL Cluster Edition</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
@@ -538,8 +510,8 @@
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-CLUSTERS?(?:-log)?$" flags="REG_ICASE">
-    <example>4.1.21-CLUSTERS</example>
-    <example>5.0.46-cluster</example>
+    <example service.version="4.1.21">4.1.21-CLUSTERS</example>
+    <example service.version="5.0.46">5.0.46-cluster</example>
     <description>Oracle MySQL Cluster Edition</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
@@ -549,7 +521,7 @@
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-classic(?:-log)?">
-    <example>5.0.86-classic-log</example>
+    <example service.version="5.0.86">5.0.86-classic-log</example>
     <description>Oracle MySQL Classic Edition</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
@@ -561,48 +533,45 @@
   <!-- Linux only - http://www.percona.com/services/mysql-support/supported-platforms -->
   <!-- Build list - http://www.percona.com/doc/percona-server/5.1/release-notes/release-notes_index.html -->
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}-?rel\d\d\.\d)(?:-log)?">
-    <example>5.1.57-rel12.8</example>
-    <example>5.1.60rel13.1-log</example>
-    <example>5.1.67-rel14.3-log</example>
+    <example service.version="5.1.57-rel12.8">5.1.57-rel12.8</example>
+    <example service.version="5.1.60rel13.1">5.1.60rel13.1-log</example>
+    <example service.version="5.1.67-rel14.3">5.1.67-rel14.3-log</example>
     <description>Percona Server (MySQL fork)</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Percona"/>
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="Percona Server"/>
-    <param pos="0" name="os.device" value="General"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}-\d\d\.\d)">
-    <example>5.5.28-29.3-log</example>
+    <example service.version="5.5.28-29.3">5.5.28-29.3-log</example>
     <description>Percona Server (MySQL fork)</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Percona"/>
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="Percona Server"/>
-    <param pos="0" name="os.device" value="General"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-(?:rc)?[Pp]ercona">
-    <example>5.1.50-percona</example>      
-    <example>5.5.27-percona-sure1-log</example>
-    <example>5.5.7-rcPercona-Server-log</example>
-    <description>Percona Server (MySQL fork)</description>
+    <example service.version="5.1.50">5.1.50-percona</example>      
+    <example service.version="5.5.27">5.5.27-percona-sure1-log</example>
+    <example service.version="5.5.7">5.5.7-rcPercona-Server-log</example>
+    <description>Percona Server (MySQL fork) w/ percona in banner</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Percona"/>
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="Percona Server"/>
-    <param pos="0" name="os.device" value="General"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-nmm">
-    <example>4.0.27-nmm1-log</example>
-    <example>4.1.22-nmm-1-log</example>
+    <example service.version="4.0.27">4.0.27-nmm1-log</example>
+    <example service.version="4.1.22">4.1.22-nmm-1-log</example>
     <description>Oracle MySQL (nmm variant)</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
@@ -611,7 +580,7 @@
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-nightly-\d{8}(?:-log)?$">
-    <example>3.23.59-nightly-20050301-log</example>
+    <example service.version="3.23.59">3.23.59-nightly-20050301-log</example>
     <description>Oracle MySQL nightly build</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
@@ -620,7 +589,7 @@
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-SERVER">
-    <example>5.1.30-SERVER-104</example>
+    <example service.version="5.1.30">5.1.30-SERVER-104</example>
     <description>Oracle MySQL (SERVER variant)</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
@@ -629,7 +598,7 @@
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-ISPrime">
-    <example>4.0.15a-ISPrime</example>
+    <example service.version="4.0.15a">4.0.15a-ISPrime</example>
     <description>Oracle MySQL (ISPrime variant)</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
@@ -638,7 +607,7 @@
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-rc-\d\.\d{1,2}\.\h{1,3}">
-    <example>5.1.26-rc-5.1.26rc-log</example>
+    <example service.version="5.1.26">5.1.26-rc-5.1.26rc-log</example>
     <description>Oracle MySQL possibly Debian specific</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
@@ -647,27 +616,25 @@
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-ius(?:-log)?$">
-    <example>5.1.66-ius-log</example>
+    <example service.version="5.1.66">5.1.66-ius-log</example>
     <description>Oracle MySQL packaged for RHEL/CentOS by IUS</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MySQL"/>
-    <param pos="0" name="os.device" value="General"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})[\.-]d\d{1,2}-ourdelta\d{0,2}(?:-log)?$">
-    <example>5.0.67.d7-ourdelta-log</example>
-    <example>5.0.87-d10-ourdelta65-log</example>
+    <example service.version="5.0.67">5.0.67.d7-ourdelta-log</example>
+    <example service.version="5.0.87">5.0.87-d10-ourdelta65-log</example>
     <description>Oracle MySQL tweaked and packaged by OurDelta</description>
     <!-- They also have a MariaDB based one based on 5.1 -->
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MySQL"/>
-    <param pos="0" name="os.device" value="General"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
@@ -683,14 +650,13 @@
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-MariaDB.+~lenny(?:-log)?$">
-    <example>5.3.2-MariaDB-beta-mariadb102~lenny</example>
+    <example service.version="5.3.2">5.3.2-MariaDB-beta-mariadb102~lenny</example>
     <description>MariaDB MariaDB on Debian Lenny</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="MariaDB"/>
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MariaDB"/>
     <param pos="0" name="os.vendor" value="Debian"/>
-    <param pos="0" name="os.device" value="General"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.version" value="5.0"/>
@@ -714,9 +680,7 @@
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="os.vendor" value="Microsoft"/>
-    <param pos="0" name="os.device" value="General"/>
     <param pos="0" name="os.family" value="Windows"/>
-    <param pos="0" name="os.product" value="Windows"/>
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-falcon-alpha(?:-log)?$">
@@ -729,7 +693,7 @@
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-tokudb-.*MariaDB(?:-log)?$">
-    <example>5.5.25-tokudb-6.1.1-47477-MariaDB-log</example>
+    <example service.version="5.5.25">5.5.25-tokudb-6.1.1-47477-MariaDB-log</example>
     <description>Tokutek customized MariaDB</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Tokutek"/>
@@ -738,7 +702,7 @@
   </fingerprint>
 
   <fingerprint pattern="^^(\d\.\d{1,2}\.\h{1,3})-Sphinx">
-    <example>5.1.40-Sphinx</example>
+    <example service.version="5.1.40">5.1.40-Sphinx</example>
     <description>Oracle MySQL with the Sphinx full text search engine</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
@@ -747,28 +711,26 @@
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:[^+]+)?\+tld\d">
-    <example>5.0.91+tld0-log</example>
-    <example>5.1.57-5.1.57+tld2-log</example>
+    <example service.version="5.0.91">5.0.91+tld0-log</example>
+    <example service.version="5.1.57">5.1.57-5.1.57+tld2-log</example>
     <description>Oracle MySQL packaged by TLD Linux</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="os.vendor" value="TLD"/>
-    <param pos="0" name="os.device" value="General"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-Debian_\d\.infrant\d$">
-    <example>5.0.24a-Debian_3.infrant1</example>
+    <example service.version="5.0.24a">5.0.24a-Debian_3.infrant1</example>
     <description>Oracle MySQL on a Netgear ReadyNAS</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="os.vendor" value="Debian"/>
-    <param pos="0" name="os.device" value="General"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="hw.vendor" value="Netgear"/>
@@ -778,7 +740,7 @@
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-beget(?:-log)?$">
-    <example>5.1.61-beget-log</example>
+    <example service.version="5.1.61">5.1.61-beget-log</example>
     <description>Oracle MySQL at Ukrainian hoster BeGet(?)</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
@@ -787,8 +749,8 @@
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-(?:Linuxtone.Org|LTOPS)(?:-log)?$">
-    <example>5.0.56-Linuxtone.Org</example>
-    <example>5.1.53-LTOPS-log</example>
+    <example service.version="5.0.56">5.0.56-Linuxtone.Org</example>
+    <example service.version="5.1.53">5.1.53-LTOPS-log</example>
     <description>Oracle MySQL at Chinese hoster Linuxtone.org</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
@@ -797,7 +759,7 @@
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-xencdn.net(?:-log)?$">
-    <example>5.1.66-xencdn.net-log</example>
+    <example service.version="5.1.66">5.1.66-xencdn.net-log</example>
     <description>Oracle MySQL at Chinese hoster Xencdn.net</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
@@ -806,7 +768,7 @@
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-Comsenz(?:-log)?$">
-    <example>5.0.27-Comsenz-log</example>
+    <example service.version="5.0.27">5.0.27-Comsenz-log</example>
     <description>Oracle MySQL at Chinese hoster Comsenz</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
@@ -815,7 +777,7 @@
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})yes(?:-log)?$">
-    <example>4.0.27yes</example>
+    <example service.version="4.0.27">4.0.27yes</example>
     <description>Oracle MySQL part of KB2 / Kimsboard (Korean site mgmt)?</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
@@ -824,7 +786,7 @@
   </fingerprint>
 
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})\.t\d{1,2}(?:-log)?$">
-    <example>5.5.24.t7-log</example>
+    <example service.version="5.5.24">5.5.24.t7-log</example>
     <description>Oracle MySQL audited/published by Twitter</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>

From 950ae3d7c990f06c74412fff36e2e838f745bf2a Mon Sep 17 00:00:00 2001
From: Tom Sellers <tom@fadedcode.net>
Date: Sun, 22 Mar 2015 22:23:07 -0500
Subject: [PATCH 06/14]  - Moved MySQL errors into a separate file -
 mysql_error.xml  - Added 'matches' attribute to the root 'fingerprints'
 element in both files  - Reordered 2 entries in mysql_errors based on most
 commonly seen banners  - Added a few additional fingerprints to
 mysq_banners.xml

---
 xml/mysql_banners.xml | 183 ++++++++++++++----------------------------
 xml/mysql_error.xml   | 115 ++++++++++++++++++++++++++
 2 files changed, 174 insertions(+), 124 deletions(-)
 create mode 100644 xml/mysql_error.xml

diff --git a/xml/mysql_banners.xml b/xml/mysql_banners.xml
index 5cb7a867..ece5c3e7 100644
--- a/xml/mysql_banners.xml
+++ b/xml/mysql_banners.xml
@@ -1,97 +1,10 @@
 <?xml version="1.0"?>
-<fingerprints>
-  <!-- Common Errors -->
+<fingerprints matches="mysql.banners">
 
-  <fingerprint pattern="^(?:#HY000)?Host '[^']+' is not allowed to connect to this MySQL server$">
-    <example>Host '10.10.10.10' is not allowed to connect to this MySQL server</example>
-    <example>#HY000Host '10.10.10.10' is not allowed to connect to this MySQL server</example>
-    <description>Oracle MySQL - Error: Host not allowed to connect (English)</description>
-    <param pos="0" name="service.vendor" value="Oracle"/>
-    <param pos="0" name="service.family" value="MySQL"/>
-    <param pos="0" name="service.product" value="MySQL"/>
-  </fingerprint>
-
-  <fingerprint pattern="^Le h.te '[^']+' n'est pas authoris. . se connecter . ce serveur MySQL$">
-    <example>Le h�te '10.10.10.10' n'est pas authoris� � se connecter � ce serveur MySQL</example>
-    <description>Oracle MySQL - Error: Host not allowed to connect (French)</description>
-    <param pos="0" name="service.vendor" value="Oracle"/>
-    <param pos="0" name="service.family" value="MySQL"/>
-    <param pos="0" name="service.product" value="MySQL"/>
-  </fingerprint>
-
-  <fingerprint pattern="^'Host' '[^']+' n.o tem permiss.o para se conectar com este servidor MySQL$">
-    <example>'Host' '10.10.10.10' n�o tem permiss�o para se conectar com este servidor MySQL</example>
-    <description>Oracle MySQL - Error: Host not allowed to connect (Spanish)</description>
-    <param pos="0" name="service.vendor" value="Oracle"/>
-    <param pos="0" name="service.family" value="MySQL"/>
-    <param pos="0" name="service.product" value="MySQL"/>
-  </fingerprint>
-
-  <fingerprint pattern="^Host.+?hat keine Berechtigung,.+?diesem MySQL">
-    <example>Host '10.10.10.10' hat keine Berechtigung, sich mit diesem MySQL-Server zu verbinden</example>
-    <example>Host hat keine Berechtigung, eine Verbindung zu diesem MySQL Server herzustellen.</example>
-    <description>Oracle MySQL - Error: Host not allowed to connect (German)</description>
-    <param pos="0" name="service.vendor" value="Oracle"/>
-    <param pos="0" name="service.family" value="MySQL"/>
-    <param pos="0" name="service.product" value="MySQL"/>
-  </fingerprint>
-
-  <fingerprint pattern="^(?:#HY000)?Host '[^']+' is blocked because of many connection errors.\s{1,2}[Uu]nblock with 'mysqladmin flush-hosts'$">
-    <example>Host '10.10.10.10' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'</example>
-    <example>Host '10.10.10.10' is blocked because of many connection errors.  Unblock with 'mysqladmin flush-hosts'</example>
-    <description>Oracle MySQL - Error: Blocked, too many errors from this host</description>
-    <param pos="0" name="service.vendor" value="Oracle"/>
-    <param pos="0" name="service.family" value="MySQL"/>
-    <param pos="0" name="service.product" value="MySQL"/>
-  </fingerprint>
-
-  <fingerprint pattern="^Host.+?blockiert wegen zu vieler Verbindungsfehler. Aufheben der Blockierung mit 'mysqladmin flush-hosts'">
-    <example>Host blockiert wegen zu vieler Verbindungsfehler. Aufheben der Blockierung mit 'mysqladmin flush-hosts'.</example>
-    <example>Host '10.10.10.10' blockiert wegen zu vieler Verbindungsfehler. Aufheben der Blockierung mit 'mysqladmin flush-hosts'</example>
-    <description>Oracle MySQL - Error: Blocked, too many errors from this host (German)</description>
-    <param pos="0" name="service.vendor" value="Oracle"/>
-    <param pos="0" name="service.family" value="MySQL"/>
-    <param pos="0" name="service.product" value="MySQL"/>
-  </fingerprint>
-
-  <fingerprint pattern="^Host '[^']+' is not allowed to connect to this MariaDB server$">
-    <example>Host '10.10.10.10' is not allowed to connect to this MariaDB server</example>
-    <description>MariaDB MariaDB - Error: Host not allowed to connect (English) </description>
-    <param pos="0" name="service.vendor" value="MariaDB"/>
-    <param pos="0" name="service.family" value="MySQL"/>
-    <param pos="0" name="service.product" value="MariaDB"/>
-  </fingerprint>
-
-  <fingerprint pattern="^Can't create a new thread \(errno -?[12]{1,2}\)">
-    <example>Can't create a new thread (errno -1); if you are not out of available memory, you can consult the manual for a possible OS-dependent bug</example>
-    <example>Can't create a new thread (errno 12); if you are not out of available memory, you can consult the manual for a possible OS-dependent bug</example>
-    <description>Oracle MySQL - Error: Out of memory</description>
-    <param pos="0" name="service.vendor" value="Oracle"/>
-    <param pos="0" name="service.family" value="MySQL"/>
-    <param pos="0" name="service.product" value="MySQL"/>
-  </fingerprint>
-
-  <fingerprint pattern="^Too many connections$">
-    <example>Too many connections</example>
-    <description>Oracle MySQL - Error: Too many connections</description>
-    <param pos="0" name="service.vendor" value="Oracle"/>
-    <param pos="0" name="service.family" value="MySQL"/>
-    <param pos="0" name="service.product" value="MySQL"/>
-  </fingerprint>
-
-  <fingerprint pattern="^Can't get hostname for your address$">
-    <example>Can't get hostname for your address</example>
-    <description>Oracle MySQL - Error: Unable to resolve client hostname</description>
-    <param pos="0" name="service.vendor" value="Oracle"/>
-    <param pos="0" name="service.family" value="MySQL"/>
-    <param pos="0" name="service.product" value="MySQL"/>
-  </fingerprint>
-
-  <!-- Standard Banner Matches -->
-
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}(?:[.-]\d{1,2})?)(?:-m\d{1,2})?(?:-rc)?(?:-alpha)?(?:-beta)?(?:-gamma)?(?:-?[Mm]ax)?(?:-rs)?(?:-modified)?(?:-debug)?(?:-log)?$">
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}(?:[.-]\d{1,2})?(?:[.-]\d{1,2})?)(?:-m\d{1,2})?(?:-rc)?(?:-alpha)?(?:-beta)?(?:-gamma)?(?:-?[Mm]ax)?(?:-rs)?(?:-modified)?(?:-debug)?(?:-log)?$">
     <example service.version="4.1.20">4.1.20</example>
     <example service.version="5.5.23-55">5.5.23-55</example>
+    <example service.version="5.5.30-1.1">5.5.30-1.1</example>
     <example service.version="5.5.18.1">5.5.18.1-log</example>
     <example service.version="5.7.4">5.7.4-m14</example>
     <example service.version="5.0.95">5.0.95-rs</example>
@@ -110,23 +23,6 @@
     <param pos="0" name="service.product" value="MySQL"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:-alpha)?(?:-beta)?(?:-rc)?-community(?:-max)?-nt(?:-log)?(?:-debug)?(?:-log)?$">
-    <example service.version="4.1.22">4.1.22-community-max-nt</example>
-    <example service.version="5.0.88">5.0.88-community-nt</example>
-    <example service.version="5.0.67">5.0.67-community-nt-log</example>
-    <example service.version="5.1.20">5.1.20-beta-community-nt-debug</example>
-    <example service.version="6.0.0">6.0.0-alpha-community-nt-debug</example>
-    <example service.version="6.0.2">6.0.2-alpha-community-nt-debug-log</example>
-    <description>Oracle MySQL Community Edition with Named Pipes (Windows)</description>
-    <param pos="1" name="service.version"/>
-    <param pos="0" name="service.vendor" value="Oracle"/>
-    <param pos="0" name="service.family" value="MySQL"/>
-    <param pos="0" name="service.product" value="MySQL"/>
-    <param pos="0" name="service.edition" value="Community Edition"/>
-    <param pos="0" name="os.vendor" value="Microsoft"/>
-    <param pos="0" name="os.family" value="Windows"/>
-  </fingerprint>
-
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:-m\d)?(?:-rc)?(?:-alpha)?(?:-beta)?-[Cc]ommunity(?:-max)?(?:-debug)?(?:-log)?(?:-debug)?$">
     <example service.version="5.0.95">5.0.95-community-log</example>
     <example service.version="5.0.37">5.0.37-Community-log</example>
@@ -143,6 +39,23 @@
     <param pos="0" name="service.edition" value="Community Edition"/>
   </fingerprint>
 
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:-alpha)?(?:-beta)?(?:-rc)?-[Cc]ommunity(?:-max)?-nt(?:-log)?(?:-debug)?(?:-log)?$">
+    <example service.version="4.1.22">4.1.22-community-max-nt</example>
+    <example service.version="5.0.88">5.0.88-community-nt</example>
+    <example service.version="5.0.67">5.0.67-community-nt-log</example>
+    <example service.version="5.1.20">5.1.20-beta-community-nt-debug</example>
+    <example service.version="6.0.0">6.0.0-alpha-community-nt-debug</example>
+    <example service.version="6.0.2">6.0.2-alpha-community-nt-debug-log</example>
+    <description>Oracle MySQL Community Edition with Named Pipes (Windows)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="service.edition" value="Community Edition"/>
+    <param pos="0" name="os.vendor" value="Microsoft"/>
+    <param pos="0" name="os.family" value="Windows"/>
+  </fingerprint>
+
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:-alpha)?(?:-beta)?(?:-rc)?(?:-gamma)?(?:-max)?-nt(?:-max)?(?:-log)?$">
     <example service.version="5.0.18">5.0.18-nt</example>
     <example service.version="4.1.12a">4.1.12a-nt-max-log</example>
@@ -536,7 +449,7 @@
     <example service.version="5.1.57-rel12.8">5.1.57-rel12.8</example>
     <example service.version="5.1.60rel13.1">5.1.60rel13.1-log</example>
     <example service.version="5.1.67-rel14.3">5.1.67-rel14.3-log</example>
-    <description>Percona Server (MySQL fork)</description>
+    <description>Percona Server (MySQL fork) match w/ 'rel'</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Percona"/>
     <param pos="0" name="service.family" value="MySQL"/>
@@ -662,9 +575,27 @@
     <param pos="0" name="os.version" value="5.0"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-[Mm]aria">
+
+
+  <fingerprint pattern="^(\d{1,2}\.\d{1,2}\.\h{1,3})-MariaDB.+~wheezy(?:-log)?$">
+    <example service.version="5.5.37">5.5.37-MariaDB-1~wheezy-log</example>
+    <example service.version="10.0.11">10.0.11-MariaDB-1~wheezy-log</example>
+    <description>MariaDB MariaDB on Debian Wheezy</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="MariaDB"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MariaDB"/>
+    <param pos="0" name="os.vendor" value="Debian"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="7.0"/>
+  </fingerprint>
+
+ <!-- This needs a end of line anchor added to the regex and retested -->
+  <fingerprint pattern="^(\d{1,2}\.\d{1,2}\.\h{1,3})-[Mm]aria">
     <example service.version="5.1.39">5.1.39-maria-beta</example>
     <example service.version="5.5.24">5.5.24-MariaDB-mariadb1~0.1</example>
+    <example service.version="10.0.1">10.0.1-MariaDB-log</example>
     <description>MariaDB MariaDB</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="MariaDB"/>
@@ -672,6 +603,16 @@
     <param pos="0" name="service.product" value="MariaDB"/>
   </fingerprint>
 
+  <fingerprint pattern="^(\d{1,2}\.\d{1,2}\.\h{1,3})-[Cc]ommunity-[Mm]aria(?:-log)?$">
+    <example service.version="5.1.44">5.1.44-community-maria-log</example>
+    <description>MariaDB MariaDB Community Edition</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="MariaDB"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MariaDB"/>
+    <param pos="0" name="service.edition" value="Community Edition"/>
+  </fingerprint>
+
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-falcon-alpha-community-nt">
     <example service.version="5.2.0">5.2.0-falcon-alpha-community-nt</example>
     <description>Oracle MySQL with defunct Falcon Storage Engine with Named Pipes (Windows)</description>
@@ -692,6 +633,15 @@
     <param pos="0" name="service.product" value="MySQL"/>
   </fingerprint>
 
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-tokudb-\d\.\d\.\d{1,2}(?:-log)?$">
+    <example service.version="5.5.40">5.5.40-tokudb-7.5.3-log</example>
+    <description>Tokutek customized MySQL</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Tokutek"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MariaDB"/>
+  </fingerprint>
+
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-tokudb-.*MariaDB(?:-log)?$">
     <example service.version="5.5.25">5.5.25-tokudb-6.1.1-47477-MariaDB-log</example>
     <description>Tokutek customized MariaDB</description>
@@ -794,19 +744,4 @@
     <param pos="0" name="service.product" value="MySQL"/>
   </fingerprint>
 
-  <fingerprint pattern="^#07000Proxy Warning - IP Forbidden$">
-    <example>#07000Proxy Warning - IP Forbidden</example>
-    <description>Oracle MySQL Proxy - Error: Host not allowed to connect</description>
-    <param pos="0" name="service.vendor" value="Oracle"/>
-    <param pos="0" name="service.family" value="MySQL"/>
-    <param pos="0" name="service.product" value="MySQL Proxy"/>
-  </fingerprint>
-
-  <fingerprint pattern="^\(proxy\) all backends are down$">
-    <example>(proxy) all backends are down</example>
-    <description>Oracle MySQL Proxy - Error: Backends down</description>
-    <param pos="0" name="service.vendor" value="Oracle"/>
-    <param pos="0" name="service.family" value="MySQL"/>
-    <param pos="0" name="service.product" value="MySQL Proxy"/>
-  </fingerprint>
 </fingerprints>
diff --git a/xml/mysql_error.xml b/xml/mysql_error.xml
new file mode 100644
index 00000000..76aac4e2
--- /dev/null
+++ b/xml/mysql_error.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0"?>
+<fingerprints matches="mysql.error">
+
+  <fingerprint pattern="^(?:#HY000)?Host '[^']+' is not allowed to connect to this MySQL server$">
+    <example>Host '10.10.10.10' is not allowed to connect to this MySQL server</example>
+    <example>#HY000Host '10.10.10.10' is not allowed to connect to this MySQL server</example>
+    <description>Oracle MySQL - Error: Host not allowed to connect (English)</description>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(?:#HY000)?Host '[^']+' is blocked because of many connection errors.\s{1,2}[Uu]nblock with 'mysqladmin flush-hosts'$">
+    <example>Host '10.10.10.10' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'</example>
+    <example>Host '10.10.10.10' is blocked because of many connection errors.  Unblock with 'mysqladmin flush-hosts'</example>
+    <description>Oracle MySQL - Error: Blocked, too many errors from this host</description>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Host '[^']+' is not allowed to connect to this MariaDB server$">
+    <example>Host '10.10.10.10' is not allowed to connect to this MariaDB server</example>
+    <description>MariaDB MariaDB - Error: Host not allowed to connect (English) </description>
+    <param pos="0" name="service.vendor" value="MariaDB"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MariaDB"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Le h.te '[^']+' n'est pas authoris. . se connecter . ce serveur MySQL$">
+    <example>Le h�te '10.10.10.10' n'est pas authoris� � se connecter � ce serveur MySQL</example>
+    <description>Oracle MySQL - Error: Host not allowed to connect (French)</description>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^'Host' '[^']+' n.o tem permiss.o para se conectar com este servidor MySQL$">
+    <example>'Host' '10.10.10.10' n�o tem permiss�o para se conectar com este servidor MySQL</example>
+    <description>Oracle MySQL - Error: Host not allowed to connect (Spanish)</description>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Host.+?hat keine Berechtigung,.+?diesem MySQL">
+    <example>Host '10.10.10.10' hat keine Berechtigung, sich mit diesem MySQL-Server zu verbinden</example>
+    <example>Host hat keine Berechtigung, eine Verbindung zu diesem MySQL Server herzustellen.</example>
+    <description>Oracle MySQL - Error: Host not allowed to connect (German)</description>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Host.+?blockiert wegen zu vieler Verbindungsfehler. Aufheben der Blockierung mit 'mysqladmin flush-hosts'">
+    <example>Host blockiert wegen zu vieler Verbindungsfehler. Aufheben der Blockierung mit 'mysqladmin flush-hosts'.</example>
+    <example>Host '10.10.10.10' blockiert wegen zu vieler Verbindungsfehler. Aufheben der Blockierung mit 'mysqladmin flush-hosts'</example>
+    <description>Oracle MySQL - Error: Blocked, too many errors from this host (German)</description>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^L'h.+?est bloqu.+?cause d'un trop grand nombre d'erreur de connexion\..+?bloquer le par 'mysqladmin flush-hosts'">
+    <example>L'h�te '10.10.10.10' est bloqu� � cause d'un trop grand nombre d'erreur de connexion. D�bloquer le par 'mysqladmin flush-hosts'</example>
+    <description>Oracle MySQL - Error: Blocked, too many errors from this host (French)</description>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Can't create a new thread \(errno -?\d{1,2}\)">
+    <example>Can't create a new thread (errno -1); if you are not out of available memory, you can consult the manual for a possible OS-dependent bug</example>
+    <example>Can't create a new thread (errno 12); if you are not out of available memory, you can consult the manual for a possible OS-dependent bug</example>
+    <example>Can't create a new thread (errno 35); if you are not out of available memory, you can consult the manual for a possible OS-dependent bug</example>
+    <description>Oracle MySQL - Error: Out of memory</description>
+    <description>Oracle MySQL - Error: Out of memory</description>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Too many connections$">
+    <example>Too many connections</example>
+    <description>Oracle MySQL - Error: Too many connections</description>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Can't get hostname for your address$">
+    <example>Can't get hostname for your address</example>
+    <description>Oracle MySQL - Error: Unable to resolve client hostname</description>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^#07000Proxy Warning - IP Forbidden$">
+    <example>#07000Proxy Warning - IP Forbidden</example>
+    <description>Oracle MySQL Proxy - Error: Host not allowed to connect</description>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL Proxy"/>
+  </fingerprint>
+
+  <fingerprint pattern="^\(proxy\) all backends are down$">
+    <example>(proxy) all backends are down</example>
+    <description>Oracle MySQL Proxy - Error: Backends down</description>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL Proxy"/>
+  </fingerprint>
+  <!-- Error code reference: http://dev.mysql.com/doc/refman/5.5/en/error-messages-server.html -->
+</fingerprints>

From 6b11c25c681a05d651120a4e10ca52c6c880f094 Mon Sep 17 00:00:00 2001
From: Tom Sellers <tom@fadedcode.net>
Date: Mon, 23 Mar 2015 07:34:19 -0500
Subject: [PATCH 07/14] - Reviewed and added more end of line regex anchors
 after additional tuning - Removed fingerprint for Percona due to too much
 overlap with standard version identifiers.  This was causing a Travis failure
 due to a Percona example matching on the 'Oracle MySQL (common)' fingerprint.
   - Percona:  5.5.28-29.3   - !Percona: 5.5.30-1.1   - !Percona: 5.5.23-55

The 'MariaDB MariaDB' fingerprint still needs end of line regex anchor review.
---
 xml/mysql_banners.xml | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/xml/mysql_banners.xml b/xml/mysql_banners.xml
index ece5c3e7..d5497eac 100644
--- a/xml/mysql_banners.xml
+++ b/xml/mysql_banners.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <fingerprints matches="mysql.banners">
 
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}(?:[.-]\d{1,2})?(?:[.-]\d{1,2})?)(?:-m\d{1,2})?(?:-rc)?(?:-alpha)?(?:-beta)?(?:-gamma)?(?:-?[Mm]ax)?(?:-rs)?(?:-modified)?(?:-debug)?(?:-log)?$">
+   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}(?:[.-]\d{1,2})?(?:[.-]\d{1})?)(?:-m\d{1,2})?(?:-rc)?(?:-alpha)?(?:-beta)?(?:-gamma)?(?:-?[Mm]ax)?(?:-rs)?(?:-modified)?(?:-debug)?(?:-log)?$">
     <example service.version="4.1.20">4.1.20</example>
     <example service.version="5.5.23-55">5.5.23-55</example>
     <example service.version="5.5.30-1.1">5.5.30-1.1</example>
@@ -117,7 +117,7 @@
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})-0ubuntu0.(\d\d\.\d\d)">
+  <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})-0ubuntu0.(\d\d\.\d\d)[.\d]*(?:-log)?$">
     <example service.version="5.1.66">5.1.66-0ubuntu0.10.04.3-log</example>
     <example service.version="5.5.28">5.5.28-0ubuntu0.12.04.3-log</example>
     <description>Oracle MySQL on Ubuntu</description>
@@ -131,7 +131,7 @@
     <param pos="2" name="os.version"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})-(?:Debian_)?\dubuntu(\d{1,2}\.\d\d)">
+  <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})-(?:Debian_)?\dubuntu(\d{1,2}\.\d\d)[.\d]*(?:-log)?$">
     <example service.version="5.0.22">5.0.22-Debian_0ubuntu6.06.14-log</example>
     <example service.version="5.1.41">5.1.41-3ubuntu12.10</example>
     <description>Oracle MySQL on Ubuntu</description>
@@ -220,9 +220,10 @@
     <param pos="0" name="os.version" value="7.0"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.[^+]+)\+lenny">
+  <fingerprint pattern="^(\d\.\d{1,2}\.[^+]+)\+lenny\d*(?:\+spu\d)?(?:-log)?$">
     <example service.version="5.0.51a-24">5.0.51a-24+lenny1-log</example>
     <example service.version="5.0.51a-24">5.0.51a-24+lenny2</example>
+    <example service.version="5.0.51a-24">5.0.51a-24+lenny2+spu1-log</example>
     <description>Oracle MySQL on Debian 5.0 (lenny)</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
@@ -260,7 +261,7 @@
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})-Debian_\d?etch\d">
+  <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})-Debian_\d?etch\d*(?:-log)?$">
     <example service.version="4.1.11">4.1.11-Debian_etch1-log</example>
     <example service.version="5.0.32">5.0.32-Debian_7etch6-log</example>
     <description>Oracle MySQL on Debian 4.0 (etch)</description>
@@ -274,7 +275,7 @@
     <param pos="0" name="os.version" value="4.0"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})[_-]Debian[_-]\d{1,2}sarge\d">
+  <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})[_-]Debian[_-]\d{1,2}sarge\d*(?:-log)?$">
     <example service.version="4.0.24">4.0.24_Debian-10sarge2-log</example>
     <example service.version="4.1.11">4.1.11-Debian_4sarge7-log</example>
     <description>Oracle MySQL on Debian 3.1 (sarge)</description>
@@ -288,7 +289,7 @@
     <param pos="0" name="os.version" value="3.1"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})[_-]Debian[_-]\d{1,2}woody\d">
+  <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})[_-]Debian[_-]\d{1,2}woody\d*(?:-log)?$">
     <example service.version="4.0.24">4.0.24_Debian-4woody1</example>
     <description>Oracle MySQL on Debian 3.0 (woody)</description>
     <param pos="1" name="service.version"/>
@@ -366,7 +367,7 @@
     <param pos="0" name="os.family" value="Windows"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-pro(?:-gpl)?(?:-log)?">
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-pro(?:-gpl)?(?:-cert)?(?:-log)?$">
     <example service.version="4.1.23">4.1.23-pro-gpl-log</example>
     <example service.version="5.0.17c">5.0.17c-pro-gpl-cert</example>
     <description>Oracle MySQL Commercial Edition</description>
@@ -458,17 +459,6 @@
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}-\d\d\.\d)">
-    <example service.version="5.5.28-29.3">5.5.28-29.3-log</example>
-    <description>Percona Server (MySQL fork)</description>
-    <param pos="1" name="service.version"/>
-    <param pos="0" name="service.vendor" value="Percona"/>
-    <param pos="0" name="service.family" value="MySQL"/>
-    <param pos="0" name="service.product" value="Percona Server"/>
-    <param pos="0" name="os.family" value="Linux"/>
-    <param pos="0" name="os.product" value="Linux"/>
-  </fingerprint>
-
   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-(?:rc)?[Pp]ercona">
     <example service.version="5.1.50">5.1.50-percona</example>      
     <example service.version="5.5.27">5.5.27-percona-sure1-log</example>
@@ -575,8 +565,6 @@
     <param pos="0" name="os.version" value="5.0"/>
   </fingerprint>
 
-
-
   <fingerprint pattern="^(\d{1,2}\.\d{1,2}\.\h{1,3})-MariaDB.+~wheezy(?:-log)?$">
     <example service.version="5.5.37">5.5.37-MariaDB-1~wheezy-log</example>
     <example service.version="10.0.11">10.0.11-MariaDB-1~wheezy-log</example>
@@ -633,8 +621,9 @@
     <param pos="0" name="service.product" value="MySQL"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-tokudb-\d\.\d\.\d{1,2}(?:-log)?$">
+  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-tokudb-\d\.\d\.\d{1,2}(?:-\d*)?(?:-log)?$">
     <example service.version="5.5.40">5.5.40-tokudb-7.5.3-log</example>
+    <example service.version="5.5.21">5.5.21-tokudb-6.0.0-42634</example>
     <description>Tokutek customized MySQL</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Tokutek"/>

From 1eeb25f25eec29a6bc574331e3b94c35311b712d Mon Sep 17 00:00:00 2001
From: Tom Sellers <tom@fadedcode.net>
Date: Wed, 25 Mar 2015 06:36:07 -0500
Subject: [PATCH 08/14] - Added os.version matches where it was extracted from
 the pattern - Reviewed/tweaked some EOL regex anchors - Added OS specific
 entries for MariaDB - Added Percona version number only match back - Added OS
 specific entries for Percona

---
 xml/mysql_banners.xml | 381 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 314 insertions(+), 67 deletions(-)

diff --git a/xml/mysql_banners.xml b/xml/mysql_banners.xml
index d5497eac..030d9502 100644
--- a/xml/mysql_banners.xml
+++ b/xml/mysql_banners.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <fingerprints matches="mysql.banners">
 
-   <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}(?:[.-]\d{1,2})?(?:[.-]\d{1})?)(?:-m\d{1,2})?(?:-rc)?(?:-alpha)?(?:-beta)?(?:-gamma)?(?:-?[Mm]ax)?(?:-rs)?(?:-modified)?(?:-debug)?(?:-log)?$">
+   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3}(?:[.-]\d{1,2})?(?:[.-]\d{1})?)(?:-m\d{1,2})?(?:-rc)?(?:-alpha)?(?:-beta)?(?:-gamma)?(?:-?[Mm]ax)?(?:-rs)?(?:-modified)?(?:-debug)?(?:-log)?$">
     <example service.version="4.1.20">4.1.20</example>
     <example service.version="5.5.23-55">5.5.23-55</example>
     <example service.version="5.5.30-1.1">5.5.30-1.1</example>
@@ -23,7 +23,7 @@
     <param pos="0" name="service.product" value="MySQL"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:-m\d)?(?:-rc)?(?:-alpha)?(?:-beta)?-[Cc]ommunity(?:-max)?(?:-debug)?(?:-log)?(?:-debug)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-m\d)?(?:-rc)?(?:-alpha)?(?:-beta)?-[Cc]ommunity(?:-max)?(?:-debug)?(?:-log)?(?:-debug)?$">
     <example service.version="5.0.95">5.0.95-community-log</example>
     <example service.version="5.0.37">5.0.37-Community-log</example>
     <example service.version="5.0.21">5.0.21-community-max</example>
@@ -39,7 +39,7 @@
     <param pos="0" name="service.edition" value="Community Edition"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:-alpha)?(?:-beta)?(?:-rc)?-[Cc]ommunity(?:-max)?-nt(?:-log)?(?:-debug)?(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-alpha)?(?:-beta)?(?:-rc)?-[Cc]ommunity(?:-max)?-nt(?:-log)?(?:-debug)?(?:-log)?$">
     <example service.version="4.1.22">4.1.22-community-max-nt</example>
     <example service.version="5.0.88">5.0.88-community-nt</example>
     <example service.version="5.0.67">5.0.67-community-nt-log</example>
@@ -56,7 +56,7 @@
     <param pos="0" name="os.family" value="Windows"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:-alpha)?(?:-beta)?(?:-rc)?(?:-gamma)?(?:-max)?-nt(?:-max)?(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-alpha)?(?:-beta)?(?:-rc)?(?:-gamma)?(?:-max)?-nt(?:-max)?(?:-log)?$">
     <example service.version="5.0.18">5.0.18-nt</example>
     <example service.version="4.1.12a">4.1.12a-nt-max-log</example>
     <example service.version="3.23.58">3.23.58-max-nt</example>
@@ -71,7 +71,7 @@
     <param pos="0" name="os.family" value="Windows"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-cll$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-cll$">
     <example service.version="5.5.25a">5.5.25a-cll</example>
     <description>Oracle MySQL hosted on CPanel</description>
     <param pos="1" name="service.version"/>
@@ -81,7 +81,7 @@
     <param pos="0" name="os.family" value="Linux"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-community-cll$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-community-cll$">
     <example service.version="5.0.91">5.0.91-community-cll</example>
     <description>Oracle MySQL Community hosted on CPanel</description>
     <param pos="1" name="service.version"/>
@@ -92,7 +92,7 @@
     <param pos="0" name="os.family" value="Linux"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-cll-lve$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-cll-lve$">
     <example service.version="5.1.66">5.1.66-cll-lve</example>
     <description>Oracle MySQL on CloudLinux in a Lightweight Virtual Environment (LVE)</description>
     <param pos="1" name="service.version"/>
@@ -104,7 +104,7 @@
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-community-cll-lve$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-community-cll-lve$">
     <example service.version="5.0.95">5.0.95-community-cll-lve</example>
     <description>Oracle MySQL Community on CloudLinux in a Lightweight Virtual Environment (LVE)</description>
     <param pos="1" name="service.version"/>
@@ -117,9 +117,9 @@
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})-0ubuntu0.(\d\d\.\d\d)[.\d]*(?:-log)?$">
-    <example service.version="5.1.66">5.1.66-0ubuntu0.10.04.3-log</example>
-    <example service.version="5.5.28">5.5.28-0ubuntu0.12.04.3-log</example>
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\d{1,2})-0ubuntu0.(\d\d\.\d\d)[.\d]*(?:-log)?$">
+    <example service.version="5.1.66" os.version="10.04">5.1.66-0ubuntu0.10.04.3-log</example>
+    <example service.version="5.5.28" os.version="12.04">5.5.28-0ubuntu0.12.04.3-log</example>
     <description>Oracle MySQL on Ubuntu</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
@@ -131,9 +131,9 @@
     <param pos="2" name="os.version"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})-(?:Debian_)?\dubuntu(\d{1,2}\.\d\d)[.\d]*(?:-log)?$">
-    <example service.version="5.0.22">5.0.22-Debian_0ubuntu6.06.14-log</example>
-    <example service.version="5.1.41">5.1.41-3ubuntu12.10</example>
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\d{1,2})-(?:Debian_)?\dubuntu(\d{1,2}\.\d\d)[.\d]*(?:-log)?$">
+    <example service.version="5.0.22" os.version="6.06">5.0.22-Debian_0ubuntu6.06.14-log</example>
+    <example service.version="5.1.41" os.version="12.10">5.1.41-3ubuntu12.10</example>
     <description>Oracle MySQL on Ubuntu</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
@@ -145,7 +145,7 @@
     <param pos="2" name="os.version"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})[-_](?:Ubuntu[_-])?(?:Debian[_-])?\d{1,2}(?:~exp1)?ubuntu\d{1,2}(?:\.\d)?(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})[-_](?:Ubuntu[_-])?(?:Debian[_-])?\d{1,2}(?:~exp1)?ubuntu\d{1,2}(?:\.\d)?(?:-log)?$">
     <example service.version="5.0.45">5.0.45-Debian_1ubuntu3.4</example>
     <example service.version="5.0.51a">5.0.51a-3ubuntu5.5</example>
     <example service.version="5.0.51a">5.0.51a-3ubuntu5.8-log</example>
@@ -163,7 +163,7 @@
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.[^+]+)\+deb\.sury\.org~precise\+\d(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[^+]+)\+deb\.sury\.org~precise\+\d(?:-log)?$">
     <example service.version="5.6.19-1">5.6.19-1+deb.sury.org~precise+1</example>
     <example service.version="5.6.20-1">5.6.20-1+deb.sury.org~precise+1-log</example>
     <description>Oracle MySQL on Ubuntu 12.04 (Precise Pangolin) packaged by deb.sury.org</description>
@@ -177,7 +177,7 @@
     <param pos="0" name="os.version" value="12.04"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.[^+]+)\+deb\.sury\.org~trusty\+\d(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[^+]+)\+deb\.sury\.org~trusty\+\d(?:-log)?$">
     <example service.version="5.6.21-1">5.6.21-1+deb.sury.org~trusty+1</example>
     <example service.version="5.6.19-1">5.6.19-1+deb.sury.org~trusty+1-log</example>
     <description>Oracle MySQL on Ubuntu 14.04 (Trusty Tahr) packaged by deb.sury.org</description>
@@ -191,7 +191,7 @@
     <param pos="0" name="os.version" value="14.04"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.[^+]+)\+(?:squeeze\d|deb6u1)(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[^+]+)\+(?:squeeze\d|deb6u1)(?:-log)?$">
     <example service.version="5.1.66-0">5.1.66-0+squeeze1</example>
     <example service.version="5.1.66-0">5.1.66-0+squeeze1-log</example>
     <example service.version="5.1.73-1">5.1.73-1+deb6u1</example>
@@ -206,7 +206,7 @@
     <param pos="0" name="os.version" value="6.0"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.[^+]+)\+wheezy\d(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[^+]+)\+wheezy\d(?:-log)?$">
     <example service.version="5.5.41-0">5.5.41-0+wheezy1</example>
     <example service.version="5.5.35-0">5.5.35-0+wheezy1-log</example>
     <description>Oracle MySQL on Debian 7.0 (wheezy)</description>
@@ -220,7 +220,7 @@
     <param pos="0" name="os.version" value="7.0"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.[^+]+)\+lenny\d*(?:\+spu\d)?(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[^+]+)\+lenny\d*(?:\+spu\d)?(?:-log)?$">
     <example service.version="5.0.51a-24">5.0.51a-24+lenny1-log</example>
     <example service.version="5.0.51a-24">5.0.51a-24+lenny2</example>
     <example service.version="5.0.51a-24">5.0.51a-24+lenny2+spu1-log</example>
@@ -235,7 +235,7 @@
     <param pos="0" name="os.version" value="5.0"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-\d~bpo50">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-\d~bpo50">
     <example service.version="5.1.49">5.1.49-3~bpo50+1-log</example>
     <description>Oracle MySQL Backport on Debian 5.0 (lenny)</description>
     <param pos="1" name="service.version"/>
@@ -248,7 +248,7 @@
     <param pos="0" name="os.version" value="5.0"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-Debian_\d~?bpo\.?\d">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-Debian_\d~?bpo\.?\d">
     <example service.version="5.0.22">5.0.22-Debian_2bpo1</example>
     <example service.version="5.0.32">5.0.32-Debian_7~bpo.1-log</example>
     <description>Oracle MySQL Backport on Debian</description>
@@ -261,7 +261,7 @@
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})-Debian_\d?etch\d*(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\d{1,2})-Debian_\d?etch\d*(?:-log)?$">
     <example service.version="4.1.11">4.1.11-Debian_etch1-log</example>
     <example service.version="5.0.32">5.0.32-Debian_7etch6-log</example>
     <description>Oracle MySQL on Debian 4.0 (etch)</description>
@@ -275,7 +275,7 @@
     <param pos="0" name="os.version" value="4.0"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})[_-]Debian[_-]\d{1,2}sarge\d*(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\d{1,2})[_-]Debian[_-]\d{1,2}sarge\d*(?:-log)?$">
     <example service.version="4.0.24">4.0.24_Debian-10sarge2-log</example>
     <example service.version="4.1.11">4.1.11-Debian_4sarge7-log</example>
     <description>Oracle MySQL on Debian 3.1 (sarge)</description>
@@ -289,7 +289,7 @@
     <param pos="0" name="os.version" value="3.1"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})[_-]Debian[_-]\d{1,2}woody\d*(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\d{1,2})[_-]Debian[_-]\d{1,2}woody\d*(?:-log)?$">
     <example service.version="4.0.24">4.0.24_Debian-4woody1</example>
     <description>Oracle MySQL on Debian 3.0 (woody)</description>
     <param pos="1" name="service.version"/>
@@ -302,7 +302,7 @@
     <param pos="0" name="os.version" value="3.0"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:[_-]\d{8})?[_-]Debian[_-]\d{1,2}(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:[_-]\d{8})?[_-]Debian[_-]\d{1,2}(?:-log)?$">
     <example service.version="4.0.23">4.0.23_Debian-3-log</example>
     <example service.version="4.0.31">4.0.31-20070605_Debian-7-log</example>
     <description>Oracle MySQL on Debian (Generic match)</description>
@@ -315,7 +315,7 @@
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\d{1,2})(?:-rc)?[_-]Debian[_-]\d{1,2}~ppa\d(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\d{1,2})(?:-rc)?[_-]Debian[_-]\d{1,2}~ppa\d(?:-log)?$">
     <example service.version="5.1.22">5.1.22-rc-Debian_2~ppa5-log</example>
     <description>Oracle MySQL on Debian (Generic match) using PPA</description>
     <param pos="1" name="service.version"/>
@@ -327,7 +327,7 @@
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:-\d{1,2})?(?:-Debian)?(?:-Dotdeb)?[-~_\d\.]+dotdeb\.\d(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2})?(?:-Debian)?(?:-Dotdeb)?[-~_\d\.]+dotdeb\.\d(?:-log)?$">
     <example service.version="5.1.54">5.1.54-0.dotdeb.0</example>
     <example service.version="5.1.58">5.1.58-1~dotdeb.0</example>
     <example service.version="5.5.30">5.5.30-1~dotdeb.0-log</example>
@@ -342,7 +342,7 @@
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:-alpha)?(?:-beta)?(?:-gamma)?(?:-rc)?-standard(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-alpha)?(?:-beta)?(?:-gamma)?(?:-rc)?-standard(?:-log)?$">
     <example service.version="5.0.13">5.0.13-rc-standard-log</example>
     <example service.version="5.0.37">5.0.37-standard</example>
     <example service.version="5.0.51a">5.0.51a-standard-log</example>
@@ -354,7 +354,7 @@
     <param pos="0" name="service.edition" value="Standard Edition"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-pro(?:-gpl)?-nt(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-pro(?:-gpl)?-nt(?:-log)?$">
     <example service.version="5.0.24">5.0.24-pro-nt</example>
     <example service.version="4.1.25">4.1.25-pro-gpl-nt-log</example>
     <description>Oracle MySQL Commercial Edition with Named Pipes (Windows)</description>
@@ -367,7 +367,7 @@
     <param pos="0" name="os.family" value="Windows"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-pro(?:-gpl)?(?:-cert)?(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-pro(?:-gpl)?(?:-cert)?(?:-log)?$">
     <example service.version="4.1.23">4.1.23-pro-gpl-log</example>
     <example service.version="5.0.17c">5.0.17c-pro-gpl-cert</example>
     <description>Oracle MySQL Commercial Edition</description>
@@ -378,7 +378,7 @@
     <param pos="0" name="service.edition" value="Commercial Edition"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}sp1)">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3}sp1)">
     <example service.version="5.0.82sp1">5.0.82sp1</example>
     <example service.version="5.1.46sp1">5.1.46sp1-enterprise-gpl-advanced-log</example>
     <description>Oracle MySQL Enterprise Edition</description>
@@ -389,7 +389,7 @@
     <param pos="0" name="service.edition" value="Enterprise Edition"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-enterprise-nt">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-enterprise-nt">
     <example service.version="5.0.84">5.0.84-enterprise-nt</example>
     <description>Oracle MySQL Enterprise Edition with Named Pipes (Windows)</description>
     <param pos="1" name="service.version"/>
@@ -401,7 +401,7 @@
     <param pos="0" name="os.family" value="Windows"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:-rc)?-enterprise">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-rc)?-enterprise">
     <example service.version="5.1.26">5.1.26-rc-enterprise-gpl-log</example>
     <example service.version="5.5.27">5.5.27-enterprise-commercial-advanced-log</example>
     <description>Oracle MySQL Enterprise Edition</description>
@@ -412,7 +412,7 @@
     <param pos="0" name="service.edition" value="Enterprise Edition"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}-ndb-\d\.\d{1,2}\.\h{1,3})">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3}-ndb-\d\.\d{1,2}\.\h{1,3})">
     <example service.version="5.1.30-ndb-6.3.20">5.1.30-ndb-6.3.20-cluster-gpl-log</example>
     <example service.version="5.5.20-ndb-7.2.5">5.5.20-ndb-7.2.5-gpl</example>
     <description>Oracle MySQL Cluster Edition</description>
@@ -423,7 +423,7 @@
     <param pos="0" name="service.edition" value="Cluster Edition"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-CLUSTERS?(?:-log)?$" flags="REG_ICASE">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-CLUSTERS?(?:-log)?$" flags="REG_ICASE">
     <example service.version="4.1.21">4.1.21-CLUSTERS</example>
     <example service.version="5.0.46">5.0.46-cluster</example>
     <description>Oracle MySQL Cluster Edition</description>
@@ -434,7 +434,7 @@
     <param pos="0" name="service.edition" value="Cluster Edition"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-classic(?:-log)?">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-classic(?:-log)?">
     <example service.version="5.0.86">5.0.86-classic-log</example>
     <description>Oracle MySQL Classic Edition</description>
     <param pos="1" name="service.version"/>
@@ -446,7 +446,7 @@
 
   <!-- Linux only - http://www.percona.com/services/mysql-support/supported-platforms -->
   <!-- Build list - http://www.percona.com/doc/percona-server/5.1/release-notes/release-notes_index.html -->
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3}-?rel\d\d\.\d)(?:-log)?">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3}-?rel\d\d\.\d)(?:-log)?">
     <example service.version="5.1.57-rel12.8">5.1.57-rel12.8</example>
     <example service.version="5.1.60rel13.1">5.1.60rel13.1-log</example>
     <example service.version="5.1.67-rel14.3">5.1.67-rel14.3-log</example>
@@ -459,7 +459,7 @@
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-(?:rc)?[Pp]ercona">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-(?:rc)?[Pp]ercona$">
     <example service.version="5.1.50">5.1.50-percona</example>      
     <example service.version="5.5.27">5.5.27-percona-sure1-log</example>
     <example service.version="5.5.7">5.5.7-rcPercona-Server-log</example>
@@ -472,7 +472,71 @@
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-nmm">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-\d\d\.\d{1,2}(?:-\d\d)?(?:-log)?$">
+    <example service.version="5.1.73">5.1.73-14.12</example>      
+    <example service.version="5.6.20">5.6.20-68.0-56</example>
+    <example service.version="5.6.16">5.6.16-64.2-25-log</example>
+    <description>Percona Server (MySQL fork) (just version number match)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Percona"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="Percona Server"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-rc\d\d\.\d(?:-log)?$">
+    <example service.version="5.6.13">5.6.13-rc60.6</example>      
+    <example service.version="5.6.13">5.6.13-rc61.0-log</example>
+    <description>Percona Server (MySQL fork) match w/ 'rc'</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Percona"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="Percona Server"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-\d\d\.\d-\d{3}\.precise(?:-log)?$">
+    <example service.version="5.6.16">5.6.16-64.2-569.precise-log</example>      
+    <description>Percona Server (MySQL fork) on Ubuntu 12.04 LTS (Precise Pangolin)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Percona"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="Percona Server"/>
+    <param pos="0" name="os.vendor" value="Ubuntu"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="12.04"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-\d\d\.\d-\d{3}\.wheezy(?:-log)?$">
+    <example service.version="5.5.36">5.5.36-34.2-648.wheezy-log</example>      
+    <description>Percona Server (MySQL fork) on Debian 7.0 (wheezy)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Percona"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="Percona Server"/>
+    <param pos="0" name="os.vendor" value="Debian"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="7.0"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-\d\d\.\d-\d{3}\.squeeze(?:-log)?$">
+    <example service.version="5.5.36">5.5.36-34.2-648.squeeze</example>      
+    <description>Percona Server (MySQL fork) on Debian 6.0 (squeeze)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Percona"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="Percona Server"/>
+    <param pos="0" name="os.vendor" value="Debian"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="6.0"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-nmm">
     <example service.version="4.0.27">4.0.27-nmm1-log</example>
     <example service.version="4.1.22">4.1.22-nmm-1-log</example>
     <description>Oracle MySQL (nmm variant)</description>
@@ -482,7 +546,7 @@
     <param pos="0" name="service.product" value="MySQL"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-nightly-\d{8}(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-nightly-\d{8}(?:-log)?$">
     <example service.version="3.23.59">3.23.59-nightly-20050301-log</example>
     <description>Oracle MySQL nightly build</description>
     <param pos="1" name="service.version"/>
@@ -491,7 +555,7 @@
     <param pos="0" name="service.product" value="MySQL"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-SERVER">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-SERVER">
     <example service.version="5.1.30">5.1.30-SERVER-104</example>
     <description>Oracle MySQL (SERVER variant)</description>
     <param pos="1" name="service.version"/>
@@ -500,7 +564,7 @@
     <param pos="0" name="service.product" value="MySQL"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-ISPrime">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-ISPrime">
     <example service.version="4.0.15a">4.0.15a-ISPrime</example>
     <description>Oracle MySQL (ISPrime variant)</description>
     <param pos="1" name="service.version"/>
@@ -509,7 +573,7 @@
     <param pos="0" name="service.product" value="MySQL"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-rc-\d\.\d{1,2}\.\h{1,3}">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-rc-\d\.\d{1,2}\.\h{1,3}">
     <example service.version="5.1.26">5.1.26-rc-5.1.26rc-log</example>
     <description>Oracle MySQL possibly Debian specific</description>
     <param pos="1" name="service.version"/>
@@ -518,7 +582,7 @@
     <param pos="0" name="service.product" value="MySQL"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-ius(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-ius(?:-log)?$">
     <example service.version="5.1.66">5.1.66-ius-log</example>
     <description>Oracle MySQL packaged for RHEL/CentOS by IUS</description>
     <param pos="1" name="service.version"/>
@@ -529,7 +593,7 @@
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})[\.-]d\d{1,2}-ourdelta\d{0,2}(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})[\.-]d\d{1,2}-ourdelta\d{0,2}(?:-log)?$">
     <example service.version="5.0.67">5.0.67.d7-ourdelta-log</example>
     <example service.version="5.0.87">5.0.87-d10-ourdelta65-log</example>
     <description>Oracle MySQL tweaked and packaged by OurDelta</description>
@@ -542,7 +606,7 @@
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-Alibaba(?:-rds)?-\d{6}(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-Alibaba(?:-rds)?-\d{6}(?:-log)?$">
     <example service.version="5.1.61">5.1.61-Alibaba-121011-log</example>
     <example service.version="5.1.61">5.1.61-Alibaba-rds-201404-log</example>
     <description>Oracle MySQL Alibaba build? distro? Aliyun.com hosted?</description>
@@ -552,9 +616,22 @@
     <param pos="0" name="service.product" value="MySQL"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-MariaDB.+~lenny(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-MariaDB-cll-lve$">
+    <example service.version="5.5.34">5.5.34-MariaDB-cll-lve</example>
+    <example service.version="5.5.5">5.5.5-10.0.15-MariaDB-cll-lve</example>
+    <description>MariaDB MariaDB on CloudLinux in a Lightweight Virtual Environment (LVE)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="MariaDB"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MariaDB"/>
+    <param pos="0" name="os.vendor" value="CloudLinux"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-MariaDB.+~lenny(?:-log)?$">
     <example service.version="5.3.2">5.3.2-MariaDB-beta-mariadb102~lenny</example>
-    <description>MariaDB MariaDB on Debian Lenny</description>
+    <description>MariaDB MariaDB on Debian 5.0 (lenny)</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="MariaDB"/>
     <param pos="0" name="service.family" value="MySQL"/>
@@ -565,25 +642,185 @@
     <param pos="0" name="os.version" value="5.0"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d{1,2}\.\d{1,2}\.\h{1,3})-MariaDB.+~wheezy(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-MariaDB.+~wheezy(?:-log)?$">
     <example service.version="5.5.37">5.5.37-MariaDB-1~wheezy-log</example>
     <example service.version="10.0.11">10.0.11-MariaDB-1~wheezy-log</example>
-    <description>MariaDB MariaDB on Debian Wheezy</description>
+    <example service.version="5.5.5">5.5.5-10.0.14-MariaDB-1~wheezy-log</example>
+    <description>MariaDB MariaDB on Debian 7.0 (wheezy)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="MariaDB"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MariaDB"/>
+    <param pos="0" name="os.vendor" value="Debian"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="7.0"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-MariaDB.+~squeeze(?:-log)?$">
+    <example service.version="5.5.31">5.5.31-MariaDB-1~squeeze-log</example> 
+    <example service.version="5.5.5">5.5.5-10.0.15-MariaDB-1~squeeze-log</example>
+    <description>MariaDB MariaDB on Debian 6.0 (squeeze)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="MariaDB"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MariaDB"/>
+    <param pos="0" name="os.vendor" value="Debian"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="6.0"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\d{1,4})-MariaDB-\dubuntu\d\.(\d{1,2}\.\d\d)[\.\d]*(?:-log)?$">
+    <example service.version="5.5.39" os.version="14.04">5.5.39-MariaDB-0ubuntu0.14.04.1</example>
+    <description>MariaDB MariaDB on Ubuntu</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="os.vendor" value="Ubuntu"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="2" name="os.version"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-MariaDB.+~trusty(?:-log)?$">
+    <example service.version="5.5.5">5.5.5-10.0.15-MariaDB-1~trusty</example>
+    <description>MariaDB MariaDB on Ubuntu 14.04 (Trusty Tahr)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="MariaDB"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MariaDB"/>
+    <param pos="0" name="os.vendor" value="Ubuntu"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="14.04"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-MariaDB.+~utopic(?:-log)?$">
+    <example service.version="5.5.5">5.5.5-10.0.16-MariaDB-1~utopic-log</example>
+    <description>MariaDB MariaDB on Ubuntu 14.04 LTS (Utopic Unicorn)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="MariaDB"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MariaDB"/>
+    <param pos="0" name="os.vendor" value="Ubuntu"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="14.04"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-MariaDB.+~saucy(?:-log)?$">
+    <example service.version="5.5.39">5.5.39-MariaDB-1~saucy-log</example>
+    <description>MariaDB MariaDB on Ubuntu 13.10 (Saucy Salamander)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="MariaDB"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MariaDB"/>
+    <param pos="0" name="os.vendor" value="Ubuntu"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="13.10"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-MariaDB.+~raring(?:-log)?$">
+    <example service.version="5.5.32">5.5.32-MariaDB-1~raring-log</example>
+    <description>MariaDB MariaDB on Ubuntu 13.04 (Raring Ringtail)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="MariaDB"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MariaDB"/>
+    <param pos="0" name="os.vendor" value="Ubuntu"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="13.04"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-MariaDB.+~precise(?:-log)?$">
+    <example service.version="5.5.41">5.5.41-MariaDB-1~precise-log</example>
+    <description>MariaDB MariaDB on Ubuntu 12.04 LTS (Precise Pangolin)</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="MariaDB"/>
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MariaDB"/>
+    <param pos="0" name="os.vendor" value="Ubuntu"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="12.04"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-MariaDB.+~lucid(?:-log)?$">
+    <example service.version="5.5.34">5.5.34-MariaDB-1~lucid-log</example>
+    <description>MariaDB MariaDB on Ubuntu 10.04 (Lucid Lynx)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="MariaDB"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MariaDB"/>
+    <param pos="0" name="os.vendor" value="Ubuntu"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="10.04"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-[Mm]ariaDB.+~trusty-wsrep(?:-log)?$">
+    <example service.version="5.5.5">5.5.5-10.1.1-MariaDB-1~trusty-wsrep-log</example>
+    <description>MariaDB MariaDB with Galera Cluster on Ubuntu 14.04 (Trusty Tahr)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="MariaDB"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MariaDB"/>
+    <param pos="0" name="service.edition" value="Galera Cluster"/>
+    <param pos="0" name="os.vendor" value="Ubuntu"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="14.04"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-MariaDB.+~precise-wsrep(?:-log)?$">
+    <example service.version="5.5.5">5.5.5-10.1.1-MariaDB-1~precise-wsrep</example>
+    <description>MariaDB MariaDB with Galera Cluster on Ubuntu 12.04 (Precise Pangolin)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="MariaDB"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MariaDB"/>
+    <param pos="0" name="service.edition" value="Galera Cluster"/>
+    <param pos="0" name="os.vendor" value="Ubuntu"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="12.04"/>
+  </fingerprint>
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-MariaDB.+~wheezy-wsrep(?:-log)?$">
+    <example service.version="5.5.5">5.5.5-10.1.1-MariaDB-1~wheezy-wsrep-log</example>
+    <description>MariaDB MariaDB with Galera Cluster on Debian 7.0 (wheezy)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="MariaDB"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MariaDB"/>
+    <param pos="0" name="service.edition" value="Galera Cluster"/>
     <param pos="0" name="os.vendor" value="Debian"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.version" value="7.0"/>
   </fingerprint>
 
- <!-- This needs a end of line anchor added to the regex and retested -->
-  <fingerprint pattern="^(\d{1,2}\.\d{1,2}\.\h{1,3})-[Mm]aria">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-[Mm]ariaDB-wsrep(?:-log)?$">
+    <example service.version="5.5.5">5.5.5-10.0.15-MariaDB-wsrep</example>
+    <description>MariaDB MariaDB with Galera Cluster</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="MariaDB"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MariaDB"/>
+    <param pos="0" name="service.edition" value="Galera Cluster"/>
+  </fingerprint>
+
+
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-[Mm]aria(?:DB)?[-\d]*(?:-debug)?(?:-beta)?(?:-mariadb)?[~\.\d]*(?:-log)?$">
     <example service.version="5.1.39">5.1.39-maria-beta</example>
     <example service.version="5.5.24">5.5.24-MariaDB-mariadb1~0.1</example>
     <example service.version="10.0.1">10.0.1-MariaDB-log</example>
+    <example service.version="5.5.5">5.5.5-10.0.16-MariaDB-log</example>
+    <example service.version="5.5.30">5.5.30-MariaDB-debug</example>
+    <example service.version="5.2.10">5.2.10-MariaDB-mariadb107</example>
     <description>MariaDB MariaDB</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="MariaDB"/>
@@ -591,7 +828,7 @@
     <param pos="0" name="service.product" value="MariaDB"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d{1,2}\.\d{1,2}\.\h{1,3})-[Cc]ommunity-[Mm]aria(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-[Cc]ommunity-[Mm]aria(?:DB)?(?:-log)?$">
     <example service.version="5.1.44">5.1.44-community-maria-log</example>
     <description>MariaDB MariaDB Community Edition</description>
     <param pos="1" name="service.version"/>
@@ -601,7 +838,7 @@
     <param pos="0" name="service.edition" value="Community Edition"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-falcon-alpha-community-nt">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-falcon-alpha-community-nt">
     <example service.version="5.2.0">5.2.0-falcon-alpha-community-nt</example>
     <description>Oracle MySQL with defunct Falcon Storage Engine with Named Pipes (Windows)</description>
     <param pos="1" name="service.version"/>
@@ -612,7 +849,7 @@
     <param pos="0" name="os.family" value="Windows"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-falcon-alpha(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-falcon-alpha(?:-log)?$">
     <example service.version="5.2.0">5.2.0-falcon-alpha-log</example>
     <description>Oracle MySQL with defunct Falcon Storage Engine</description>
     <param pos="1" name="service.version"/>
@@ -621,7 +858,7 @@
     <param pos="0" name="service.product" value="MySQL"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-tokudb-\d\.\d\.\d{1,2}(?:-\d*)?(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-tokudb-\d\.\d\.\d{1,2}(?:-\d*)?(?:-log)?$">
     <example service.version="5.5.40">5.5.40-tokudb-7.5.3-log</example>
     <example service.version="5.5.21">5.5.21-tokudb-6.0.0-42634</example>
     <description>Tokutek customized MySQL</description>
@@ -631,7 +868,7 @@
     <param pos="0" name="service.product" value="MariaDB"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-tokudb-.*MariaDB(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-tokudb-.*MariaDB(?:-log)?$">
     <example service.version="5.5.25">5.5.25-tokudb-6.1.1-47477-MariaDB-log</example>
     <description>Tokutek customized MariaDB</description>
     <param pos="1" name="service.version"/>
@@ -640,7 +877,7 @@
     <param pos="0" name="service.product" value="MariaDB"/>
   </fingerprint>
 
-  <fingerprint pattern="^^(\d\.\d{1,2}\.\h{1,3})-Sphinx">
+  <fingerprint pattern="^^(\d{1,2}\.\d{1,2}\.\h{1,3})-Sphinx">
     <example service.version="5.1.40">5.1.40-Sphinx</example>
     <description>Oracle MySQL with the Sphinx full text search engine</description>
     <param pos="1" name="service.version"/>
@@ -649,7 +886,7 @@
     <param pos="0" name="service.product" value="MySQL"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})(?:[^+]+)?\+tld\d">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:[^+]+)?\+tld\d">
     <example service.version="5.0.91">5.0.91+tld0-log</example>
     <example service.version="5.1.57">5.1.57-5.1.57+tld2-log</example>
     <description>Oracle MySQL packaged by TLD Linux</description>
@@ -662,7 +899,7 @@
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-Debian_\d\.infrant\d$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-Debian_\d\.infrant\d$">
     <example service.version="5.0.24a">5.0.24a-Debian_3.infrant1</example>
     <description>Oracle MySQL on a Netgear ReadyNAS</description>
     <param pos="1" name="service.version"/>
@@ -678,7 +915,7 @@
     <param pos="0" name="hw.product" value="ReadyNAS"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-beget(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-beget(?:-log)?$">
     <example service.version="5.1.61">5.1.61-beget-log</example>
     <description>Oracle MySQL at Ukrainian hoster BeGet(?)</description>
     <param pos="1" name="service.version"/>
@@ -687,7 +924,7 @@
     <param pos="0" name="service.product" value="MySQL"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-(?:Linuxtone.Org|LTOPS)(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-(?:Linuxtone.Org|LTOPS)(?:-log)?$">
     <example service.version="5.0.56">5.0.56-Linuxtone.Org</example>
     <example service.version="5.1.53">5.1.53-LTOPS-log</example>
     <description>Oracle MySQL at Chinese hoster Linuxtone.org</description>
@@ -697,7 +934,7 @@
     <param pos="0" name="service.product" value="MySQL"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-xencdn.net(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-xencdn.net(?:-log)?$">
     <example service.version="5.1.66">5.1.66-xencdn.net-log</example>
     <description>Oracle MySQL at Chinese hoster Xencdn.net</description>
     <param pos="1" name="service.version"/>
@@ -706,7 +943,7 @@
     <param pos="0" name="service.product" value="MySQL"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})-Comsenz(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-Comsenz(?:-log)?$">
     <example service.version="5.0.27">5.0.27-Comsenz-log</example>
     <description>Oracle MySQL at Chinese hoster Comsenz</description>
     <param pos="1" name="service.version"/>
@@ -715,7 +952,17 @@
     <param pos="0" name="service.product" value="MySQL"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})yes(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3}(?:[.-]\d{1,2})?(?:[.-]\d{1})?)[-\d]*-beget(?:-log)?$">
+    <example service.version="5.6.16-64.0">5.6.16-64.0-beget-log</example>
+    <example service.version="5.6.21-70.0">5.6.21-70.0-1-beget-log</example>
+    <description>Oracle MySQL at Russian hoster Beget</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})yes(?:-log)?$">
     <example service.version="4.0.27">4.0.27yes</example>
     <description>Oracle MySQL part of KB2 / Kimsboard (Korean site mgmt)?</description>
     <param pos="1" name="service.version"/>
@@ -724,7 +971,7 @@
     <param pos="0" name="service.product" value="MySQL"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d\.\d{1,2}\.\h{1,3})\.t\d{1,2}(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})\.t\d{1,2}(?:-log)?$">
     <example service.version="5.5.24">5.5.24.t7-log</example>
     <description>Oracle MySQL audited/published by Twitter</description>
     <param pos="1" name="service.version"/>

From 33eaf5bbf137d8677c93c547f704cc0922b137ab Mon Sep 17 00:00:00 2001
From: Tom Sellers <tom@fadedcode.net>
Date: Wed, 25 Mar 2015 06:38:31 -0500
Subject: [PATCH 09/14] Push the correct version of the file...

---
 xml/mysql_banners.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xml/mysql_banners.xml b/xml/mysql_banners.xml
index 030d9502..012b761c 100644
--- a/xml/mysql_banners.xml
+++ b/xml/mysql_banners.xml
@@ -459,7 +459,7 @@
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-(?:rc)?[Pp]ercona$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-(?:rc)?[Pp]ercona">
     <example service.version="5.1.50">5.1.50-percona</example>      
     <example service.version="5.5.27">5.5.27-percona-sure1-log</example>
     <example service.version="5.5.7">5.5.7-rcPercona-Server-log</example>

From ab842e6024679454c8cbe4234bc3716f09a2693e Mon Sep 17 00:00:00 2001
From: Tom Sellers <tom@fadedcode.net>
Date: Wed, 25 Mar 2015 06:43:40 -0500
Subject: [PATCH 10/14] Add os.product on one of the Linux matches

---
 xml/mysql_banners.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xml/mysql_banners.xml b/xml/mysql_banners.xml
index 012b761c..f92fba85 100644
--- a/xml/mysql_banners.xml
+++ b/xml/mysql_banners.xml
@@ -90,6 +90,7 @@
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="service.edition" value="Community Edition"/>
     <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-cll-lve$">

From f34764ffb09a30b6f7e6ea6bb5f27030e97ccf6a Mon Sep 17 00:00:00 2001
From: Tom Sellers <tom@fadedcode.net>
Date: Thu, 26 Mar 2015 07:39:28 -0500
Subject: [PATCH 11/14] - fingerprint tweaks - additional FPs for backports,
 certain OS/product combinations

---
 xml/mysql_banners.xml | 159 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 138 insertions(+), 21 deletions(-)

diff --git a/xml/mysql_banners.xml b/xml/mysql_banners.xml
index f92fba85..1f5a723f 100644
--- a/xml/mysql_banners.xml
+++ b/xml/mysql_banners.xml
@@ -249,6 +249,32 @@
     <param pos="0" name="os.version" value="5.0"/>
   </fingerprint>
 
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3}).*~?bpo40(?:\+\d)?(?:-log)?$">
+    <example service.version="5.0.51a">5.0.51a-24+lenny2~bpo40+1-log</example>
+    <description>Oracle MySQL Backport on Debian 4.0 (etch)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="os.vendor" value="Debian"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="4.0"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-Debian.*~?bpo31(?:\+\d)?(?:-log)?$">
+    <example service.version="5.0.32">5.0.32-Debian_7etch5~bpo31+1-log</example>
+    <description>Oracle MySQL Backport on Debian 3.1 (sarge)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="os.vendor" value="Debian"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="3.1"/>
+  </fingerprint>
+  <!-- FIXFIX -->
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-Debian_\d~?bpo\.?\d">
     <example service.version="5.0.22">5.0.22-Debian_2bpo1</example>
     <example service.version="5.0.32">5.0.32-Debian_7~bpo.1-log</example>
@@ -460,6 +486,17 @@
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-\d\d\.\d{1,2}-rel\d\d\.\d{1,2}(?:-log)?$">
+    <example service.version="5.6.17">5.6.17-65.0-rel65.0</example>
+    <description>Percona Server (MySQL fork) match w/ 'rel' variant 1</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Percona"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="Percona Server"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+  </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-(?:rc)?[Pp]ercona">
     <example service.version="5.1.50">5.1.50-percona</example>      
     <example service.version="5.5.27">5.5.27-percona-sure1-log</example>
@@ -498,6 +535,45 @@
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-\d\d\.\d-\d{3}\.trusty(?:-log)?$">
+    <example service.version="5.6.17">5.6.17-65.0-583.trusty</example>      
+    <description>Percona Server (MySQL fork) on Ubuntu 14.04 (Trusty Tahr)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Percona"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="Percona Server"/>
+    <param pos="0" name="os.vendor" value="Ubuntu"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="14.04"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-\d\d\.\d-\d{3}\.saucy(?:-log)?$">
+    <example service.version="5.6.17">5.6.17-65.0-587.saucy</example>      
+    <description>Percona Server (MySQL fork) on Ubuntu 13.10 (Saucy Salamander)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Percona"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="Percona Server"/>
+    <param pos="0" name="os.vendor" value="Ubuntu"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="13.10"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-\d\d\.\d-\d{3}\.quantal(?:-log)?$">
+    <example service.version="5.6.16">5.6.16-64.2-569.quantal-log</example>      
+    <description>Percona Server (MySQL fork) on Ubuntu 12.10 (Quantal Quetzal)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Percona"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="Percona Server"/>
+    <param pos="0" name="os.vendor" value="Ubuntu"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="12.10"/>
+  </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-\d\d\.\d-\d{3}\.precise(?:-log)?$">
     <example service.version="5.6.16">5.6.16-64.2-569.precise-log</example>      
     <description>Percona Server (MySQL fork) on Ubuntu 12.04 LTS (Precise Pangolin)</description>
@@ -630,19 +706,6 @@
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-MariaDB.+~lenny(?:-log)?$">
-    <example service.version="5.3.2">5.3.2-MariaDB-beta-mariadb102~lenny</example>
-    <description>MariaDB MariaDB on Debian 5.0 (lenny)</description>
-    <param pos="1" name="service.version"/>
-    <param pos="0" name="service.vendor" value="MariaDB"/>
-    <param pos="0" name="service.family" value="MySQL"/>
-    <param pos="0" name="service.product" value="MariaDB"/>
-    <param pos="0" name="os.vendor" value="Debian"/>
-    <param pos="0" name="os.family" value="Linux"/>
-    <param pos="0" name="os.product" value="Linux"/>
-    <param pos="0" name="os.version" value="5.0"/>
-  </fingerprint>
-
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-MariaDB.+~wheezy(?:-log)?$">
     <example service.version="5.5.37">5.5.37-MariaDB-1~wheezy-log</example>
     <example service.version="10.0.11">10.0.11-MariaDB-1~wheezy-log</example>
@@ -672,6 +735,31 @@
     <param pos="0" name="os.version" value="6.0"/>
   </fingerprint>
 
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-MariaDB.+~lenny(?:-log)?$">
+    <example service.version="5.3.2">5.3.2-MariaDB-beta-mariadb102~lenny</example>
+    <description>MariaDB MariaDB on Debian 5.0 (lenny)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="MariaDB"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MariaDB"/>
+    <param pos="0" name="os.vendor" value="Debian"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="5.0"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-MariaDB.+~sid(?:-log)?$">
+    <example service.version="5.5.5">5.5.5-10.0.16-MariaDB-1~sid</example>
+    <description>MariaDB MariaDB on Debian Unstable/No version  (sid)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="MariaDB"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MariaDB"/>
+    <param pos="0" name="os.vendor" value="Debian"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+  </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\d{1,4})-MariaDB-\dubuntu\d\.(\d{1,2}\.\d\d)[\.\d]*(?:-log)?$">
     <example service.version="5.5.39" os.version="14.04">5.5.39-MariaDB-0ubuntu0.14.04.1</example>
     <description>MariaDB MariaDB on Ubuntu</description>
@@ -685,9 +773,9 @@
     <param pos="2" name="os.version"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-MariaDB.+~trusty(?:-log)?$">
-    <example service.version="5.5.5">5.5.5-10.0.15-MariaDB-1~trusty</example>
-    <description>MariaDB MariaDB on Ubuntu 14.04 (Trusty Tahr)</description>
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-MariaDB.+~utopic(?:-log)?$">
+    <example service.version="5.5.5">5.5.5-10.0.16-MariaDB-1~utopic-log</example>
+    <description>MariaDB MariaDB on Ubuntu 14.10 (Utopic Unicorn)</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="MariaDB"/>
     <param pos="0" name="service.family" value="MySQL"/>
@@ -695,12 +783,12 @@
     <param pos="0" name="os.vendor" value="Ubuntu"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
-    <param pos="0" name="os.version" value="14.04"/>
+    <param pos="0" name="os.version" value="14.10"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-MariaDB.+~utopic(?:-log)?$">
-    <example service.version="5.5.5">5.5.5-10.0.16-MariaDB-1~utopic-log</example>
-    <description>MariaDB MariaDB on Ubuntu 14.04 LTS (Utopic Unicorn)</description>
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-MariaDB.+~trusty(?:-log)?$">
+    <example service.version="5.5.5">5.5.5-10.0.15-MariaDB-1~trusty</example>
+    <description>MariaDB MariaDB on Ubuntu 14.04 (Trusty Tahr)</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="MariaDB"/>
     <param pos="0" name="service.family" value="MySQL"/>
@@ -737,6 +825,20 @@
     <param pos="0" name="os.version" value="13.04"/>
   </fingerprint>
 
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-MariaDB.+~quantal(?:-log)?$">
+    <example service.version="5.5.5">5.5.5-10.0.12-MariaDB-1~quantal-log</example>
+    <example service.version="5.5.38">5.5.38-MariaDB-1~quantal-log</example>
+    <description>MariaDB MariaDB on Ubuntu 12.10 (Quantal Quetzal)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="MariaDB"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MariaDB"/>
+    <param pos="0" name="os.vendor" value="Ubuntu"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="12.10"/>
+  </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-MariaDB.+~precise(?:-log)?$">
     <example service.version="5.5.41">5.5.41-MariaDB-1~precise-log</example>
     <description>MariaDB MariaDB on Ubuntu 12.04 LTS (Precise Pangolin)</description>
@@ -790,6 +892,7 @@
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.version" value="12.04"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-MariaDB.+~wheezy-wsrep(?:-log)?$">
     <example service.version="5.5.5">5.5.5-10.1.1-MariaDB-1~wheezy-wsrep-log</example>
     <description>MariaDB MariaDB with Galera Cluster on Debian 7.0 (wheezy)</description>
@@ -804,6 +907,19 @@
     <param pos="0" name="os.version" value="7.0"/>
   </fingerprint>
 
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-MariaDB.+~sid-wsrep(?:-log)?$">
+    <example service.version="5.5.5">5.5.5-10.0.16-MariaDB-1~sid-wsrep</example>
+    <description>MariaDB MariaDB with Galera Cluster on Debian Unstable/No version (sid)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="MariaDB"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MariaDB"/>
+    <param pos="0" name="service.edition" value="Galera Cluster"/>
+    <param pos="0" name="os.vendor" value="Debian"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+  </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-[Mm]ariaDB-wsrep(?:-log)?$">
     <example service.version="5.5.5">5.5.5-10.0.15-MariaDB-wsrep</example>
     <description>MariaDB MariaDB with Galera Cluster</description>
@@ -815,8 +931,9 @@
   </fingerprint>
 
 
-  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-[Mm]aria(?:DB)?[-\d]*(?:-debug)?(?:-beta)?(?:-mariadb)?[~\.\d]*(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-[Mm]aria(?:DB)?[-\d]*(?:-debug)?(?:-ga)?(?:-beta)?(?:-mariadb)?[~\.\d]*(?:-log)?$">
     <example service.version="5.1.39">5.1.39-maria-beta</example>
+    <example service.version="5.3.5">5.3.5-MariaDB-ga-mariadb113-log</example>
     <example service.version="5.5.24">5.5.24-MariaDB-mariadb1~0.1</example>
     <example service.version="10.0.1">10.0.1-MariaDB-log</example>
     <example service.version="5.5.5">5.5.5-10.0.16-MariaDB-log</example>

From a4fcaa65d667b867e7bea34800cab8fd53350334 Mon Sep 17 00:00:00 2001
From: Tom Sellers <tom@fadedcode.net>
Date: Fri, 27 Mar 2015 06:08:03 -0500
Subject: [PATCH 12/14] Additional patterns and fp tweaks

---
 xml/mysql_banners.xml | 110 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 109 insertions(+), 1 deletion(-)

diff --git a/xml/mysql_banners.xml b/xml/mysql_banners.xml
index 1f5a723f..bbe8c580 100644
--- a/xml/mysql_banners.xml
+++ b/xml/mysql_banners.xml
@@ -865,6 +865,19 @@
     <param pos="0" name="os.version" value="10.04"/>
   </fingerprint>
 
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-MariaDB.+~hardy(?:-log)?$">
+    <example service.version="5.5.34">5.5.34-MariaDB-mariadb122~hardy-log</example>
+    <description>MariaDB MariaDB on Ubuntu 8.04 LTS (Hardy Heron)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="MariaDB"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MariaDB"/>
+    <param pos="0" name="os.vendor" value="Ubuntu"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="8.04"/>
+  </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-[Mm]ariaDB.+~trusty-wsrep(?:-log)?$">
     <example service.version="5.5.5">5.5.5-10.1.1-MariaDB-1~trusty-wsrep-log</example>
     <description>MariaDB MariaDB with Galera Cluster on Ubuntu 14.04 (Trusty Tahr)</description>
@@ -879,6 +892,20 @@
     <param pos="0" name="os.version" value="14.04"/>
   </fingerprint>
 
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-MariaDB.+~saucy-wsrep(?:-log)?$">
+    <example service.version="5.5.5">5.5.5-10.0.10-MariaDB-1~saucy-wsrep-log</example>
+    <description>MariaDB MariaDB with Galera Cluster on Ubuntu 13.10 (Saucy Salamander)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="MariaDB"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MariaDB"/>
+    <param pos="0" name="service.edition" value="Galera Cluster"/>
+    <param pos="0" name="os.vendor" value="Ubuntu"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="13.10"/>
+  </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-MariaDB.+~precise-wsrep(?:-log)?$">
     <example service.version="5.5.5">5.5.5-10.1.1-MariaDB-1~precise-wsrep</example>
     <description>MariaDB MariaDB with Galera Cluster on Ubuntu 12.04 (Precise Pangolin)</description>
@@ -893,6 +920,20 @@
     <param pos="0" name="os.version" value="12.04"/>
   </fingerprint>
 
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-MariaDB.+~lucid-wsrep(?:-log)?$">
+    <example service.version="5.5.34">5.5.34-MariaDB-1~lucid-wsrep-log</example>
+    <description>MariaDB MariaDB with Galera Cluster on Ubuntu 10.04 TLS (Lucid Lynx)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="MariaDB"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MariaDB"/>
+    <param pos="0" name="service.edition" value="Galera Cluster"/>
+    <param pos="0" name="os.vendor" value="Ubuntu"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="10.04"/>
+  </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-MariaDB.+~wheezy-wsrep(?:-log)?$">
     <example service.version="5.5.5">5.5.5-10.1.1-MariaDB-1~wheezy-wsrep-log</example>
     <description>MariaDB MariaDB with Galera Cluster on Debian 7.0 (wheezy)</description>
@@ -907,6 +948,20 @@
     <param pos="0" name="os.version" value="7.0"/>
   </fingerprint>
 
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-MariaDB.+~squeeze-wsrep(?:-log)?$">
+    <example service.version="5.5.5">5.5.5-10.1.1-MariaDB-1~squeeze-wsrep</example>
+    <description>MariaDB MariaDB with Galera Cluster on Debian 6.0 (squeeze)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="MariaDB"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MariaDB"/>
+    <param pos="0" name="service.edition" value="Galera Cluster"/>
+    <param pos="0" name="os.vendor" value="Debian"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="6.0"/>
+  </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-MariaDB.+~sid-wsrep(?:-log)?$">
     <example service.version="5.5.5">5.5.5-10.0.16-MariaDB-1~sid-wsrep</example>
     <description>MariaDB MariaDB with Galera Cluster on Debian Unstable/No version (sid)</description>
@@ -967,8 +1022,9 @@
     <param pos="0" name="os.family" value="Windows"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-falcon-alpha(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-falcon-alpha(?:-community)?(?:-log)?$">
     <example service.version="5.2.0">5.2.0-falcon-alpha-log</example>
+    <example service.version="5.2.0">5.2.0-falcon-alpha-community</example>
     <description>Oracle MySQL with defunct Falcon Storage Engine</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
@@ -1070,6 +1126,16 @@
     <param pos="0" name="service.product" value="MySQL"/>
   </fingerprint>
 
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-www\.gamewave\.net(?:-edition)?(?:-log)?$">
+    <example service.version="5.1.56">5.1.56-www.gamewave.net-edition-log</example>
+    <example service.version="5.1.56">5.1.56-www.gamewave.net-log</example>
+    <description>Oracle MySQL at Chinese game hoster Gamewave</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3}(?:[.-]\d{1,2})?(?:[.-]\d{1})?)[-\d]*-beget(?:-log)?$">
     <example service.version="5.6.16-64.0">5.6.16-64.0-beget-log</example>
     <example service.version="5.6.21-70.0">5.6.21-70.0-1-beget-log</example>
@@ -1098,4 +1164,46 @@
     <param pos="0" name="service.product" value="MySQL"/>
   </fingerprint>
 
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3}) Hybrid Cluster MySQL Proxy to$">
+    <example service.version="5.5.15">5.5.15 Hybrid Cluster MySQL Proxy to</example>
+    <description>Oracle MySQL by Hybrid Cluster (hosted?)</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3}) ScaleBase Data Traffic Manager [\.\d]+$">
+    <example service.version="5.1.53">5.1.53 ScaleBase Data Traffic Manager 3.2.3</example>
+    <description>Oracle MySQL behind ScaleBase Data Traffic Manager</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-\d\d\.\d{1,2}-\d\.ctbanco\d+(?:-log)?$">
+    <example service.version="5.6.16">5.6.16-64.1-1.ctbanco60-log</example>
+    <example service.version="5.6.16">5.6.16-64.1-1.ctbanco7-log</example>
+    <description>Percona Server (MySQL fork) with 'ctbanco' </description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Percona"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="Percona Server"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3}) Complete MySQL by Server Logistics(?:-log)?$">
+    <example service.version="4.0.21">4.0.21 Complete MySQL by Server Logistics-log</example>
+    <description>Oracle MySQL packaged by Server Logistics, Mac specific</description>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="os.vendor" value="Apple"/>
+    <param pos="0" name="os.family" value="Mac OS X"/>
+    <param pos="0" name="os.product" value="Mac OS X"/>
+  </fingerprint>
+
 </fingerprints>

From 1f3f1590d69f3d58a857f6c6ea4d3a509fff6ae7 Mon Sep 17 00:00:00 2001
From: Tom Sellers <tom@fadedcode.net>
Date: Fri, 27 Mar 2015 06:14:22 -0500
Subject: [PATCH 13/14] a few more tweaks

---
 xml/mysql_banners.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xml/mysql_banners.xml b/xml/mysql_banners.xml
index bbe8c580..5c158462 100644
--- a/xml/mysql_banners.xml
+++ b/xml/mysql_banners.xml
@@ -1155,8 +1155,9 @@
     <param pos="0" name="service.product" value="MySQL"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})\.t\d{1,2}(?:-log)?$">
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})\.t\d{1,2}(?:[\.\d]{3})?(?:-log)?$">
     <example service.version="5.5.24">5.5.24.t7-log</example>
+    <example service.version="5.5.31">5.5.31.t11.1</example>
     <description>Oracle MySQL audited/published by Twitter</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>

From 62c556995ae91dabd57f01c769df3f97530d1e65 Mon Sep 17 00:00:00 2001
From: Jon Hart <jon_hart@rapid7.com>
Date: Tue, 31 Mar 2015 13:00:48 -0700
Subject: [PATCH 14/14] Add comments describing the intended use of the MySQL
 fingerprint files

---
 xml/mysql_banners.xml | 31 +++++++++++++++++++++----------
 xml/mysql_error.xml   | 14 ++++++++++++++
 2 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/xml/mysql_banners.xml b/xml/mysql_banners.xml
index 5c158462..b65a84be 100644
--- a/xml/mysql_banners.xml
+++ b/xml/mysql_banners.xml
@@ -1,4 +1,15 @@
 <?xml version="1.0"?>
+<!--
+     Upon successful connection to an MySQL/derivative TCP endpoint, provided
+     the connecting client is allowed to speak to the MySQL service (for
+     example, it hasn't been blocked for too many failed password attempts and
+     is explicitly allowed to connect from this client), the first packet
+     recieved will contain the MySQL server greeting which contains things like
+     the protocol spoken, capabilities and, most importantly, a version.  This
+     version is a null-terminated, free-form field starting at the 6th byte of
+     the TCP payload and the fingerprints below are used to match and extract
+     from this version.
+-->
 <fingerprints matches="mysql.banners">
 
    <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3}(?:[.-]\d{1,2})?(?:[.-]\d{1})?)(?:-m\d{1,2})?(?:-rc)?(?:-alpha)?(?:-beta)?(?:-gamma)?(?:-?[Mm]ax)?(?:-rs)?(?:-modified)?(?:-debug)?(?:-log)?$">
@@ -498,7 +509,7 @@
   </fingerprint>
 
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-(?:rc)?[Pp]ercona">
-    <example service.version="5.1.50">5.1.50-percona</example>      
+    <example service.version="5.1.50">5.1.50-percona</example>
     <example service.version="5.5.27">5.5.27-percona-sure1-log</example>
     <example service.version="5.5.7">5.5.7-rcPercona-Server-log</example>
     <description>Percona Server (MySQL fork) w/ percona in banner</description>
@@ -511,7 +522,7 @@
   </fingerprint>
 
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-\d\d\.\d{1,2}(?:-\d\d)?(?:-log)?$">
-    <example service.version="5.1.73">5.1.73-14.12</example>      
+    <example service.version="5.1.73">5.1.73-14.12</example>
     <example service.version="5.6.20">5.6.20-68.0-56</example>
     <example service.version="5.6.16">5.6.16-64.2-25-log</example>
     <description>Percona Server (MySQL fork) (just version number match)</description>
@@ -524,7 +535,7 @@
   </fingerprint>
 
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-rc\d\d\.\d(?:-log)?$">
-    <example service.version="5.6.13">5.6.13-rc60.6</example>      
+    <example service.version="5.6.13">5.6.13-rc60.6</example>
     <example service.version="5.6.13">5.6.13-rc61.0-log</example>
     <description>Percona Server (MySQL fork) match w/ 'rc'</description>
     <param pos="1" name="service.version"/>
@@ -536,7 +547,7 @@
   </fingerprint>
 
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-\d\d\.\d-\d{3}\.trusty(?:-log)?$">
-    <example service.version="5.6.17">5.6.17-65.0-583.trusty</example>      
+    <example service.version="5.6.17">5.6.17-65.0-583.trusty</example>
     <description>Percona Server (MySQL fork) on Ubuntu 14.04 (Trusty Tahr)</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Percona"/>
@@ -549,7 +560,7 @@
   </fingerprint>
 
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-\d\d\.\d-\d{3}\.saucy(?:-log)?$">
-    <example service.version="5.6.17">5.6.17-65.0-587.saucy</example>      
+    <example service.version="5.6.17">5.6.17-65.0-587.saucy</example>
     <description>Percona Server (MySQL fork) on Ubuntu 13.10 (Saucy Salamander)</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Percona"/>
@@ -562,7 +573,7 @@
   </fingerprint>
 
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-\d\d\.\d-\d{3}\.quantal(?:-log)?$">
-    <example service.version="5.6.16">5.6.16-64.2-569.quantal-log</example>      
+    <example service.version="5.6.16">5.6.16-64.2-569.quantal-log</example>
     <description>Percona Server (MySQL fork) on Ubuntu 12.10 (Quantal Quetzal)</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Percona"/>
@@ -575,7 +586,7 @@
   </fingerprint>
 
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-\d\d\.\d-\d{3}\.precise(?:-log)?$">
-    <example service.version="5.6.16">5.6.16-64.2-569.precise-log</example>      
+    <example service.version="5.6.16">5.6.16-64.2-569.precise-log</example>
     <description>Percona Server (MySQL fork) on Ubuntu 12.04 LTS (Precise Pangolin)</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Percona"/>
@@ -588,7 +599,7 @@
   </fingerprint>
 
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-\d\d\.\d-\d{3}\.wheezy(?:-log)?$">
-    <example service.version="5.5.36">5.5.36-34.2-648.wheezy-log</example>      
+    <example service.version="5.5.36">5.5.36-34.2-648.wheezy-log</example>
     <description>Percona Server (MySQL fork) on Debian 7.0 (wheezy)</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Percona"/>
@@ -601,7 +612,7 @@
   </fingerprint>
 
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})-\d\d\.\d-\d{3}\.squeeze(?:-log)?$">
-    <example service.version="5.5.36">5.5.36-34.2-648.squeeze</example>      
+    <example service.version="5.5.36">5.5.36-34.2-648.squeeze</example>
     <description>Percona Server (MySQL fork) on Debian 6.0 (squeeze)</description>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Percona"/>
@@ -722,7 +733,7 @@
   </fingerprint>
 
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\h{1,3})(?:-\d{1,2}\.\d{1,3}\.\h{1,4})?-MariaDB.+~squeeze(?:-log)?$">
-    <example service.version="5.5.31">5.5.31-MariaDB-1~squeeze-log</example> 
+    <example service.version="5.5.31">5.5.31-MariaDB-1~squeeze-log</example>
     <example service.version="5.5.5">5.5.5-10.0.15-MariaDB-1~squeeze-log</example>
     <description>MariaDB MariaDB on Debian 6.0 (squeeze)</description>
     <param pos="1" name="service.version"/>
diff --git a/xml/mysql_error.xml b/xml/mysql_error.xml
index 76aac4e2..2d601b32 100644
--- a/xml/mysql_error.xml
+++ b/xml/mysql_error.xml
@@ -1,4 +1,18 @@
 <?xml version="1.0"?>
+<!--
+     Upon successful connection to an MySQL/derivative TCP endpoint, if
+     the connecting client is not allowed to speak to the MySQL service (for
+     example, it has been blocked for too many failed password attempts or it
+     isn't explicitly allowed to connect from this client), the first packet
+     received will contain an error message that is used to inform the client
+     of this failure prior to forcibly disconnecting the client:
+
+     $  mysql -u root -h mysql.example.com
+     ERROR 1130 (HY000): Host '192.168.0.100' is not allowed to connect to this MySQL server
+
+     This free-form field starts at the 7th byte and ends at the end of the TCP
+     payload.  The fingerprints below are used to match and extract from this field.
+-->
 <fingerprints matches="mysql.error">
 
   <fingerprint pattern="^(?:#HY000)?Host '[^']+' is not allowed to connect to this MySQL server$">