From 356775da35b86ef363003ebd295218e23f57b817 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Fri, 27 Sep 2024 18:27:36 +0200
Subject: [PATCH] More occurrences of com.mysql.jdbc.Driver / replace them all

---
 xdocs/usermanual/build-db-test-plan.xml   |  2 +-
 xdocs/usermanual/component_reference.xml  | 40 ++++++++++++++---------
 xdocs/usermanual/properties_reference.xml |  2 +-
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/xdocs/usermanual/build-db-test-plan.xml b/xdocs/usermanual/build-db-test-plan.xml
index 8e6d1729801..64b4d3f91c5 100644
--- a/xdocs/usermanual/build-db-test-plan.xml
+++ b/xdocs/usermanual/build-db-test-plan.xml
@@ -122,7 +122,7 @@ Then, select this new element to view its Control Panel (see Figure &sect-num;.3
 <ul>
 <li>Variable name (here: <code>myDatabase</code>) bound to pool. This needs to uniquely identify the configuration. It is used by the JDBC Sampler to identify the configuration to be used.</li>
 <li>Database URL: <code>jdbc:mysql://ipOfTheServer:3306/cloud</code></li>
-<li>JDBC Driver class: <code>com.mysql.jdbc.Driver</code></li>
+<li>JDBC Driver class: <code>com.mysql.cj.jdbc.Driver</code></li>
 <li>Username: <em>the username of database</em></li>
 <li>Password: <em>password for the username</em></li>
 </ul>
diff --git a/xdocs/usermanual/component_reference.xml b/xdocs/usermanual/component_reference.xml
index c91719f909d..04925267b6e 100644
--- a/xdocs/usermanual/component_reference.xml
+++ b/xdocs/usermanual/component_reference.xml
@@ -4101,21 +4101,29 @@ instead. (see figures 12 and 13).</p>
         JMeter's classpath - easiest to copy <code>.jar</code> file into JMeter's <code>/lib</code> directory).
         <p>The list of the preconfigured jdbc driver classes can be configured with <code>jdbc.config.jdbc.driver.class</code> property and are by default:</p>
             <dl>
-              <dt>hsqldb</dt><dd>org.hsqldb.jdbc.JDBCDriver</dd>
-              <dt>Oracle</dt><dd>oracle.jdbc.OracleDriver</dd>
-              <dt>DB2</dt><dd>com.ibm.db2.jcc.DB2Driver</dd>
-              <dt>MySQL</dt><dd>com.mysql.cj.jdbc.Driver</dd><dd>com.mysql.jdbc.Driver (deprecated)</dd>
-              <dt>Microsoft SQL Server (MS JDBC driver)</dt><dd>com.microsoft.sqlserver.jdbc.SQLServerDriver or com.microsoft.jdbc.sqlserver.SQLServerDriver</dd>
-              <dt>PostgreSQL</dt><dd>org.postgresql.Driver</dd>
-              <dt>Ingres</dt><dd>com.ingres.jdbc.IngresDriver</dd>
-              <dt>Derby</dt><dd>org.apache.derby.jdbc.ClientDriver</dd>
-              <dt>H2</dt><dd>org.h2.Driver</dd>
-              <dt>Firebird</dt><dd>org.firebirdsql.jdbc.FBDriver</dd>
-              <dt>Apache Derby</dt><dd>org.apache.derby.jdbc.ClientDriver</dd>
-              <dt>MariaDB</dt><dd>org.mariadb.jdbc.Driver</dd>
-              <dt>SQLite</dt><dd>org.sqlite.JDBC</dd>
-              <dt>Sybase AES</dt><dd>net.sourceforge.jtds.jdbc.Driver</dd>
-              <dt>Exasol</dt><dd>com.exasol.jdbc.EXADriver</dd>
+              <dt>hsqldb</dt><dd><code>org.hsqldb.jdbc.JDBCDriver</code/><dd>
+              <dt>Oracle</dt><dd><code>oracle.jdbc.OracleDriver</code></dd>
+              <dt>DB2</dt><dd><code>com.ibm.db2.jcc.DB2Driver</code></dd>
+              <dt>MySQL</dt>
+              <dd>
+                <code>com.mysql.cj.jdbc.Driver</code><br/>
+                <code>com.mysql.jdbc.Driver</code> (deprecated)
+              </dd>
+              <dt>Microsoft SQL Server (MS JDBC driver)</dt>
+              <dd>
+                <code>com.microsoft.sqlserver.jdbc.SQLServerDriver</code> or
+                <code>com.microsoft.jdbc.sqlserver.SQLServerDriver</code>
+              </dd>
+              <dt>PostgreSQL</dt><dd><code>org.postgresql.Driver</code></dd>
+              <dt>Ingres</dt><dd><code>com.ingres.jdbc.IngresDriver</code></dd>
+              <dt>Derby</dt><dd><code>org.apache.derby.jdbc.ClientDriver</code></dd>
+              <dt>H2</dt><dd><code>org.h2.Driver</code></dd>
+              <dt>Firebird</dt><dd><code>org.firebirdsql.jdbc.FBDriver</code></dd>
+              <dt>Apache Derby</dt><dd><code>org.apache.derby.jdbc.ClientDriver</code></dd>
+              <dt>MariaDB</dt><dd><code>org.mariadb.jdbc.Driver</code></dd>
+              <dt>SQLite</dt><dd><code>org.sqlite.JDBC</code></dd>
+              <dt>Sybase AES</dt><dd><code>net.sourceforge.jtds.jdbc.Driver</code></dd>
+              <dt>Exasol</dt><dd><code>com.exasol.jdbc.EXADriver</code></dd>
             </dl>
         </property>
         <property name="Username" required="No">Name of user to connect as.</property>
@@ -4142,7 +4150,7 @@ If the database server is not running or is not accessible, then JMeter will rep
   <dd>
     <dl>
       <dt>Driver class</dt>
-      <dd><code>com.mysql.jdbc.Driver</code></dd>
+      <dd><code>com.mysql.cj.jdbc.Driver</code></dd>
       <dt>Database URL</dt>
       <dd><code>jdbc:mysql://host[:port]/dbname</code></dd>
     </dl>
diff --git a/xdocs/usermanual/properties_reference.xml b/xdocs/usermanual/properties_reference.xml
index cb9cd3ba2cd..d74ece0613d 100644
--- a/xdocs/usermanual/properties_reference.xml
+++ b/xdocs/usermanual/properties_reference.xml
@@ -1048,7 +1048,7 @@ JMETER-SERVER</source>
 </property>
 <property name="jdbc.config.jdbc.driver.class">
     List of JDBC driver class name<br/>
-    Defaults to: <source>com.mysql.jdbc.Driver|org.postgresql.Driver|oracle.jdbc.OracleDriver|com.ingres.jdbc.IngresDriver|com.microsoft.sqlserver.jdbc.SQLServerDriver|com.microsoft.jdbc.sqlserver.SQLServerDriver|org.apache.derby.jdbc.ClientDriver|org.hsqldb.jdbc.JDBCDriver|com.ibm.db2.jcc.DB2Driver|org.apache.derby.jdbc.ClientDriver|org.h2.Driver|org.firebirdsql.jdbc.FBDriver|org.mariadb.jdbc.Driver|org.sqlite.JDBC|net.sourceforge.jtds.jdbc.Driver|com.exasol.jdbc.EXADriver</source>
+    Defaults to: <source>com.mysql.cj.jdbc.Driver|com.mysql.jdbc.Driver|org.postgresql.Driver|oracle.jdbc.OracleDriver|com.ingres.jdbc.IngresDriver|com.microsoft.sqlserver.jdbc.SQLServerDriver|com.microsoft.jdbc.sqlserver.SQLServerDriver|org.apache.derby.jdbc.ClientDriver|org.hsqldb.jdbc.JDBCDriver|com.ibm.db2.jcc.DB2Driver|org.apache.derby.jdbc.ClientDriver|org.h2.Driver|org.firebirdsql.jdbc.FBDriver|org.mariadb.jdbc.Driver|org.sqlite.JDBC|net.sourceforge.jtds.jdbc.Driver|com.exasol.jdbc.EXADriver</source>
 </property>
 </properties>
 </section>