From 05a0eae335ebdd1f9ac7540c263b870a17d69b9f Mon Sep 17 00:00:00 2001
From: Alexander Barkov <bar@mariadb.com>
Date: Wed, 27 Oct 2021 07:21:34 +0400
Subject: MDEV-22380 Assertion `name.length == strlen(name.str)' failed ..
 w/optimizer_trace enabled

Adding 10.4 specific tests.
---
 mysql-test/main/opt_trace.result | 35 +++++++++++++++++++++++++++++++++++
 mysql-test/main/opt_trace.test   |  9 +++++++++
 2 files changed, 44 insertions(+)

diff --git a/mysql-test/main/opt_trace.result b/mysql-test/main/opt_trace.result
index 0ced5f19e14..c16df0da0b2 100644
--- a/mysql-test/main/opt_trace.result
+++ b/mysql-test/main/opt_trace.result
@@ -8599,5 +8599,40 @@ select count(*) from information_schema.optimizer_trace;
 select * from information_schema.optimizer_trace;
 set max_session_mem_used=default;
 #
+# MDEV-22380 Assertion `name.length == strlen(name.str)' failed in Item::print_item_w_name on SELECT w/ optimizer_trace enabled
+#
+SET optimizer_trace="enabled=on";
+SELECT 'a\0' LIMIT 0;
+a\x00
+SELECT query, trace FROM INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+query	trace
+SELECT 'a\0' LIMIT 0	{
+  "steps": [
+    {
+      "join_preparation": {
+        "select_id": 1,
+        "steps": [
+          {
+            "expanded_query": "select 'a\0' AS `a\x00` limit 0"
+          }
+        ]
+      }
+    },
+    {
+      "join_optimization": {
+        "select_id": 1,
+        "steps": []
+      }
+    },
+    {
+      "join_execution": {
+        "select_id": 1,
+        "steps": []
+      }
+    }
+  ]
+}
+SET optimizer_trace=DEFAULT;
+#
 # End of 10.4 tests
 #
diff --git a/mysql-test/main/opt_trace.test b/mysql-test/main/opt_trace.test
index 3fae7f34750..1dfb7e5ce8a 100644
--- a/mysql-test/main/opt_trace.test
+++ b/mysql-test/main/opt_trace.test
@@ -634,6 +634,15 @@ select * from information_schema.optimizer_trace;
 --enable_result_log
 set max_session_mem_used=default;
 
+--echo #
+--echo # MDEV-22380 Assertion `name.length == strlen(name.str)' failed in Item::print_item_w_name on SELECT w/ optimizer_trace enabled
+--echo #
+
+SET optimizer_trace="enabled=on";
+SELECT 'a\0' LIMIT 0;
+SELECT query, trace FROM INFORMATION_SCHEMA.OPTIMIZER_TRACE;
+SET optimizer_trace=DEFAULT;
+
 --echo #
 --echo # End of 10.4 tests
 --echo #
-- 
cgit v1.2.1