From 4a6e2d343745c11086c05f0041a8267591bb073c Mon Sep 17 00:00:00 2001
From: Sergei Petrunia <psergey@askmonty.org>
Date: Wed, 30 Jun 2021 16:43:43 +0300
Subject: [PATCH] Post-merge fix: update derived_cond_pushdown.result

---
 mysql-test/main/derived_cond_pushdown.result | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mysql-test/main/derived_cond_pushdown.result b/mysql-test/main/derived_cond_pushdown.result
index b886db20eed..d2c116913f4 100644
--- a/mysql-test/main/derived_cond_pushdown.result
+++ b/mysql-test/main/derived_cond_pushdown.result
@@ -10764,6 +10764,7 @@ EXPLAIN
               {
                 "query_block": {
                   "select_id": 3,
+                  "operation": "UNION",
                   "table": {
                     "table_name": "t1",
                     "access_type": "ref",