From f560c1ba429e6fd1f1a8df8babed88c99f8d2952 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Thu, 10 Dec 2015 10:32:11 +0100
Subject: [PATCH] revert 5e9a50efc37c233f1e2a3616f8bcb36315aba4c2

that was mistakenly merged from mysql-5.5.47

(introduces valgrind failures in main.sp, because Field_varstring
columns are created as FIELD_NORMAL and that causes aria to
read bytes between the actual value length and field max length)
---
 sql/sql_select.cc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 3d39fc266db..f43f506692c 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -15433,9 +15433,7 @@ create_tmp_table(THD *thd, TMP_TABLE_PARAM *param, List<Item> &fields,
              field->real_type() == MYSQL_TYPE_STRING &&
 	     length >= MIN_STRING_LENGTH_TO_PACK_ROWS)
       recinfo->type= FIELD_SKIP_ENDSPACE;
-    else if (use_packed_rows &&
-             field->real_type() == MYSQL_TYPE_VARCHAR &&
-             length >= MIN_STRING_LENGTH_TO_PACK_ROWS)
+    else if (field->real_type() == MYSQL_TYPE_VARCHAR)
       recinfo->type= FIELD_VARCHAR;
     else
       recinfo->type= FIELD_NORMAL;