From 4ed4bb585080f0eeedb04a512bf193268e16e9b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tem=C3=A5?= <63051187+tema-mazy@users.noreply.github.com>
Date: Mon, 2 Sep 2024 15:49:34 +0200
Subject: [PATCH 1/2] Update StringUtils.java

BUG: in non ANSI mode ' -> ''
should be ' -> \'
---
 src/main/core-api/java/com/mysql/cj/util/StringUtils.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/core-api/java/com/mysql/cj/util/StringUtils.java b/src/main/core-api/java/com/mysql/cj/util/StringUtils.java
index 7dd47d1fc..6bda0273a 100644
--- a/src/main/core-api/java/com/mysql/cj/util/StringUtils.java
+++ b/src/main/core-api/java/com/mysql/cj/util/StringUtils.java
@@ -1766,7 +1766,11 @@ public static StringBuilder escapeString(StringBuilder buf, String x, boolean us
                     buf.append('\\');
                     break;
                 case '\'':
-                    buf.append('\'');
+                    if (useAnsiQuotedIdentifiers) {
+                        buf.append('\'');
+                    } else {
+                        buf.append('\\');
+                    }
                     buf.append('\'');
                     break;
                 case '"': /* Better safe than sorry */

From dd5c9af37784ef9b82e45819576189f2ee24eeb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tem=C3=A5?= <63051187+tema-mazy@users.noreply.github.com>
Date: Thu, 5 Sep 2024 16:13:28 +0200
Subject: [PATCH 2/2] Update StringUtils.java

\' should be quoted as \\\'  not \'\'

https://github.com/mysql/mysql-server/blob/trunk/mysys/charset.cc#L475
---
 src/main/core-api/java/com/mysql/cj/util/StringUtils.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/main/core-api/java/com/mysql/cj/util/StringUtils.java b/src/main/core-api/java/com/mysql/cj/util/StringUtils.java
index 6bda0273a..af9fc1b9e 100644
--- a/src/main/core-api/java/com/mysql/cj/util/StringUtils.java
+++ b/src/main/core-api/java/com/mysql/cj/util/StringUtils.java
@@ -1766,11 +1766,7 @@ public static StringBuilder escapeString(StringBuilder buf, String x, boolean us
                     buf.append('\\');
                     break;
                 case '\'':
-                    if (useAnsiQuotedIdentifiers) {
-                        buf.append('\'');
-                    } else {
-                        buf.append('\\');
-                    }
+                    buf.append('\\');
                     buf.append('\'');
                     break;
                 case '"': /* Better safe than sorry */