From 76d6ac448d18a9e97ce4be585d79607780e00a49 Mon Sep 17 00:00:00 2001
From: Oleksandr Byelkin <sanja@mariadb.com>
Date: Tue, 11 Aug 2015 18:45:38 +0200
Subject: MDEV-6066: Merge new defaults from 5.6 and 5.7 (defaults changed, QC
 can be stopped with no-zero size)

---
 mysql-test/r/explain_json.result | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'mysql-test/r/explain_json.result')

diff --git a/mysql-test/r/explain_json.result b/mysql-test/r/explain_json.result
index f81a62ef23b..0507cee62b4 100644
--- a/mysql-test/r/explain_json.result
+++ b/mysql-test/r/explain_json.result
@@ -371,7 +371,7 @@ EXPLAIN
         "attached_condition": "(tbl2.b < 5)"
       },
       "buffer_type": "flat",
-      "buffer_size": "128Kb",
+      "buffer_size": "256Kb",
       "join_type": "BNL",
       "attached_condition": "(tbl2.a = tbl1.a)"
     }
@@ -638,7 +638,7 @@ EXPLAIN
         "filtered": 100
       },
       "buffer_type": "flat",
-      "buffer_size": "128Kb",
+      "buffer_size": "256Kb",
       "join_type": "BNL"
     }
   }
@@ -672,7 +672,7 @@ EXPLAIN
         "first_match": "t2"
       },
       "buffer_type": "flat",
-      "buffer_size": "128Kb",
+      "buffer_size": "256Kb",
       "join_type": "BNL",
       "attached_condition": "((t1.b = t2.b) and (t1.a = t2.a))"
     }
@@ -709,7 +709,7 @@ EXPLAIN
           "filtered": 100
         },
         "buffer_type": "flat",
-        "buffer_size": "128Kb",
+        "buffer_size": "256Kb",
         "join_type": "BNL",
         "attached_condition": "((t1.b = t2.b) and (t1.a = t2.a))"
       }
@@ -822,7 +822,7 @@ EXPLAIN
               "filtered": 100
             },
             "buffer_type": "flat",
-            "buffer_size": "128Kb",
+            "buffer_size": "256Kb",
             "join_type": "BNL",
             "attached_condition": "((t2.b <> outer_t1.a) and trigcond(((<cache>(outer_t1.a) = t1.a) or isnull(t1.a))))"
           }
@@ -873,7 +873,7 @@ EXPLAIN
               "filtered": 100
             },
             "buffer_type": "flat",
-            "buffer_size": "128Kb",
+            "buffer_size": "256Kb",
             "join_type": "BNL",
             "attached_condition": "(tbl2.b = tbl1.b)"
           }
-- 
cgit v1.2.1