MDEV-38033: JSON_SCHEMA_VALID returns wrong result for array of objects

mysql-test/main/func_json.result

@@ -5396,3 +5396,49 @@ result
 [["2", "6"], ["3", "8"], ["4", "5"], ["1", "7"]]
 [["2", "6"], ["3", "8"], ["4", "5"], ["1", "7"]]
 # End of 11.4 Test
+#
+# MDEV-38033: JSON_SCHEMA_VALID function returning wrong result
+#
+SET @schema= '
+{
+  "type": "object",
+  "properties": 
+  {
+    "id": {
+      "type": "string",
+      "minLength": 1
+    },
+    "arr_fields": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "field1": {
+            "type": "string"
+          },
+          "field2": {
+            "type": "number"
+          }
+        },
+        "required": ["field1"]
+      }
+    }
+  }
+}';
+SET @value= '
+{
+  "id": "zero",
+  "arr_fields": [
+    {
+      "field1": "A",
+      "field2": 123
+    },
+    {
+      "field1": "B"
+    }
+  ]
+}';
+SELECT JSON_SCHEMA_VALID(@schema, @value);
+JSON_SCHEMA_VALID(@schema, @value)
+1
+# End of 12.1 Test

mysql-test/main/func_json.test

@@ -4277,3 +4277,52 @@ SELECT ( WITH x AS ( WITH x ( x ) AS ( SELECT ( 1.000000 ) ) SELECT x FROM x ) S
 select json_array_intersect('[["1", "7"], ["2", "6"], ["4", "5"], ["3", "8"]]', '[["2","6"],["3","8"],["4","5"],["1","7"]]') as result from mysql.user;
 
 --echo # End of 11.4 Test
+
+--echo #
+--echo # MDEV-38033: JSON_SCHEMA_VALID function returning wrong result
+--echo #
+
+SET @schema= '
+{
+  "type": "object",
+  "properties": 
+  {
+    "id": {
+      "type": "string",
+      "minLength": 1
+    },
+    "arr_fields": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "field1": {
+            "type": "string"
+          },
+          "field2": {
+            "type": "number"
+          }
+        },
+        "required": ["field1"]
+      }
+    }
+  }
+}';
+
+SET @value= '
+{
+  "id": "zero",
+  "arr_fields": [
+    {
+      "field1": "A",
+      "field2": 123
+    },
+    {
+      "field1": "B"
+    }
+  ]
+}';
+
+SELECT JSON_SCHEMA_VALID(@schema, @value);
+
+--echo # End of 12.1 Test

sql/json_schema.cc

@@ -1218,6 +1218,11 @@ bool Json_schema_items::validate(const json_engine_t *je,
     count++;
     if (validate_schema_items(&curr_je, &items_schema))
       return true;
+    if (!json_value_scalar(&curr_je))
+    {
+      if (json_skip_level(&curr_je))
+        return true;
+    }
   }
 
   return is_false ? (!count ? false : true) : false;