Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3MDEV-9804

Conflicts:
	VERSION
	debian/mariadb-backup-10.2.files
	debian/mariadb-backup-10.2.install
	debian/mariadb-backup-10.3.files
	mysql-test/unstable-tests

1 files changed, 60 insertions, 0 deletions

diff --git a/mysql-test/r/analyze_format_json.result b/mysql-test/r/analyze_format_json.result
index e077f919aa0..7991379bc55 100644
--- a/mysql-test/r/analyze_format_json.result
+++ b/mysql-test/r/analyze_format_json.result
@@ -758,3 +758,63 @@ ANALYZE
   }
 }
 drop table t1,t2,t3;
+#
+# MDEV-13286: Floating point exception in Filesort_tracker::print_json_members(Json_writer*)
+#
+create table t0(a int);
+insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
+create table t1 (a int, b int, c int);
+insert into t1 select a,a,a from t0;
+create table t2 as select * from t1;
+analyze format=json select a, (select t2.b from t2 where t2.a<t1.a order by t2.c limit 1) from t1 where t1.a<0;
+ANALYZE
+{
+  "query_block": {
+    "select_id": 1,
+    "r_loops": 1,
+    "r_total_time_ms": "REPLACED",
+    "table": {
+      "table_name": "t1",
+      "access_type": "ALL",
+      "r_loops": 1,
+      "rows": 10,
+      "r_rows": 10,
+      "r_total_time_ms": "REPLACED",
+      "filtered": 100,
+      "r_filtered": 0,
+      "attached_condition": "t1.a < 0"
+    },
+    "subqueries": [
+      {
+        "expression_cache": {
+          "state": "uninitialized",
+          "r_loops": 0,
+          "query_block": {
+            "select_id": 2,
+            "read_sorted_file": {
+              "r_rows": null,
+              "filesort": {
+                "sort_key": "t2.c",
+                "r_loops": null,
+                "r_limit": null,
+                "r_used_priority_queue": null,
+                "r_output_rows": null,
+                "table": {
+                  "table_name": "t2",
+                  "access_type": "ALL",
+                  "r_loops": 0,
+                  "rows": 10,
+                  "r_rows": null,
+                  "filtered": 100,
+                  "r_filtered": null,
+                  "attached_condition": "t2.a < t1.a"
+                }
+              }
+            }
+          }
+        }
+      }
+    ]
+  }
+}
+drop table t0,t1,t2;