1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed valgrind complain on usage of uninitialized data.

Browse Source
This commit is contained in:
Igor Babaev 2013-04-09 10:26:39 -07:00
parent 1db675b6e8
commit 549ada35b0
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sql/field.cc
View File

@ -6202,16 +6202,15 @@ double Field_str::middle_point_pos(Field *min, Field *max)
uchar minp_prefix[sizeof(ulonglong)]; uchar minp_prefix[sizeof(ulonglong)];
uchar maxp_prefix[sizeof(ulonglong)]; uchar maxp_prefix[sizeof(ulonglong)];
ulonglong mp, minp, maxp; ulonglong mp, minp, maxp;
uint dsz= min(field_length, sizeof(ulonglong) * charset()->mbmaxlen);
memset(mp_prefix, 0, sizeof(ulonglong));
memset(minp_prefix, 0, sizeof(ulonglong));
memset(maxp_prefix, 0, sizeof(ulonglong));
my_strnxfrm(charset(), mp_prefix, sizeof(mp), my_strnxfrm(charset(), mp_prefix, sizeof(mp),
ptr + length_size(), dsz); ptr + length_size(),
data_length());
my_strnxfrm(charset(), minp_prefix, sizeof(minp), my_strnxfrm(charset(), minp_prefix, sizeof(minp),
min->ptr + length_size(), dsz); min->ptr + length_size(),
min->data_length());
my_strnxfrm(charset(), maxp_prefix, sizeof(maxp), my_strnxfrm(charset(), maxp_prefix, sizeof(maxp),
max->ptr + length_size(), dsz); max->ptr + length_size(),
max->data_length());
mp= char_prefix_to_ulonglong(mp_prefix); mp= char_prefix_to_ulonglong(mp_prefix);
minp= char_prefix_to_ulonglong(minp_prefix); minp= char_prefix_to_ulonglong(minp_prefix);
maxp= char_prefix_to_ulonglong(maxp_prefix); maxp= char_prefix_to_ulonglong(maxp_prefix);