From 5ffbd084f5dc1e7d05fd3172237ed50feef70b18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
Date: Thu, 9 Feb 2017 16:02:21 +0200
Subject: [PATCH] Revert an accidental commit to work around MDEV-11601.

---
 sql/sql_show.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 180856d9f16..58fc2edc6f2 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -7609,8 +7609,7 @@ TABLE *create_schema_table(THD *thd, TABLE_LIST *table_list)
     case MYSQL_TYPE_BLOB:
       if (!(item= new (mem_root)
             Item_blob(thd, fields_info->field_name,
-                      std::min(unsigned (strlen(fields_info->field_name)),
-                               fields_info->field_length))))
+                      fields_info->field_length)))
       {
         DBUG_RETURN(0);
       }