From 194776ce00f6fea37551ea25584798f78b0ad24b Mon Sep 17 00:00:00 2001
From: Kailasnath Nagarkar <kailasnath.nagarkar@oracle.com>
Date: Thu, 4 Aug 2016 12:49:50 +0530
Subject: [PATCH] Bug #19984392 : MEDIUMINT: STACK BUFFER OVERFLOW IN
 PROTOCOL_TEXT::STORE_LONG

Reverting the patch due to some issues.
---
 sql/field.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/field.cc b/sql/field.cc
index d9889f0fb48..3ca072e7771 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -347,7 +347,7 @@ static enum_field_types field_types_merge_rules [FIELDTYPE_NUM][FIELDTYPE_NUM]=
   //MYSQL_TYPE_NULL         MYSQL_TYPE_TIMESTAMP
     MYSQL_TYPE_LONGLONG,    MYSQL_TYPE_VARCHAR,
   //MYSQL_TYPE_LONGLONG     MYSQL_TYPE_INT24
-    MYSQL_TYPE_LONGLONG,    MYSQL_TYPE_LONGLONG,
+    MYSQL_TYPE_LONGLONG,    MYSQL_TYPE_LONG,
   //MYSQL_TYPE_DATE         MYSQL_TYPE_TIME
     MYSQL_TYPE_VARCHAR,     MYSQL_TYPE_VARCHAR,
   //MYSQL_TYPE_DATETIME     MYSQL_TYPE_YEAR