mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 12:32:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

revert 5e9a50efc3

Browse source 
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)
This commit is contained in:
Sergei Golubchik 2015-12-10 10:32:11 +01:00
parent 265e833fdd
commit f560c1ba42
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sql/sql_select.cc
View file

@ -15433,9 +15433,7 @@ create_tmp_table(THD *thd, TMP_TABLE_PARAM *param, List<Item> &fields,
field->real_type() == MYSQL_TYPE_STRING && field->real_type() == MYSQL_TYPE_STRING &&
length >= MIN_STRING_LENGTH_TO_PACK_ROWS) length >= MIN_STRING_LENGTH_TO_PACK_ROWS)
recinfo->type= FIELD_SKIP_ENDSPACE; recinfo->type= FIELD_SKIP_ENDSPACE;
else if (use_packed_rows && else if (field->real_type() == MYSQL_TYPE_VARCHAR)
field->real_type() == MYSQL_TYPE_VARCHAR &&
length >= MIN_STRING_LENGTH_TO_PACK_ROWS)
recinfo->type= FIELD_VARCHAR; recinfo->type= FIELD_VARCHAR;
else else
recinfo->type= FIELD_NORMAL; recinfo->type= FIELD_NORMAL;