Skip to content

Commit

Permalink
revert 5e9a50e
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
vuvova committed Dec 11, 2015
1 parent 265e833 commit f560c1b
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions sql/sql_select.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit f560c1b

Please sign in to comment.