diff options
| author | Kailasnath Nagarkar <kailasnath.nagarkar@oracle.com> | 2016-08-04 12:49:50 +0530 |
|---|---|---|
| committer | Kailasnath Nagarkar <kailasnath.nagarkar@oracle.com> | 2016-08-04 12:49:50 +0530 |
| commit | 194776ce00f6fea37551ea25584798f78b0ad24b (patch) | |
| tree | 5241e677adf5e901125c2e8da607bab2bf6857cd /sql | |
| parent | 322afb2c0a6bc7c8ffb365c61b90392bfe4b4f31 (diff) | |
| download | mariadb-git-194776ce00f6fea37551ea25584798f78b0ad24b.tar.gz | |
Bug #19984392 : MEDIUMINT: STACK BUFFER OVERFLOW IN PROTOCOL_TEXT::STORE_LONG
Reverting the patch due to some issues.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/field.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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 |