[jmeter] 01/03: Add MariaDB examples to JDBC documentation

[fs...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git

commit c8ae21188c2cd315e89730c4625a3f00a44bf089
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Mon Jun 17 18:11:49 2019 +0200

    Add MariaDB examples to JDBC documentation
    
    Contributed by Ori Marko (orimarko at gmail.com)
    Bugzilla Id: 63513
---
 xdocs/changes.xml                        | 2 ++
 xdocs/usermanual/component_reference.xml | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index f4b8421..9caca77 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -182,6 +182,7 @@ to view the last major behaviors with the version 5.1.1.
 
 <h3>Documentation</h3>
 <ul>
+    <li><bug>63513</bug>Add MariaDB examples to JDBC documentation. Contributed by Ori Marko (orimarko at gmail.com)</li>
 </ul>
 
 <h3>General</h3>
@@ -202,6 +203,7 @@ to view the last major behaviors with the version 5.1.1.
   <li>Xia Li</li>
   <li>Naveen Nandwani (naveen.nandwani at india.nec.com)</li>
   <li>Artem Fedorov (artem.fedorov at blazemeter.com)</li>
+  <li>Ori Marko (orimarko at gmail.com)</li>
 </ul>
 <p>We also thank bug reporters who helped us improve JMeter.</p>
 <ul>
diff --git a/xdocs/usermanual/component_reference.xml b/xdocs/usermanual/component_reference.xml
index e668012..d57edd1 100644
--- a/xdocs/usermanual/component_reference.xml
+++ b/xdocs/usermanual/component_reference.xml
@@ -4060,6 +4060,15 @@ If the database server is not running or is not accessible, then JMeter will rep
       <dd><code>jdbc:derby://server[:port]/databaseName[;URLAttributes=value[;&hellip;]]</code></dd>
     </dl>
   </dd>
+  <dt>MariaDB</dt>
+  <dd>
+    <dl>
+      <dt>Driver class</dt>
+      <dd><code>org.mariadb.jdbc.Driver</code></dd>
+      <dt>Database URL</dt>
+      <dd><code>jdbc:mariadb://host[:port]/dbname[;URLAttributes=value[;&hellip;]]</code></dd>
+    </dl>
+  </dd>
 </dl>
 <note>The above may not be correct - please check the relevant JDBC driver documentation.</note>
 </component>