Merge mysql-5.1 to mysql-5.5.

This commit is contained in:
Marko Mäkelä 2013-08-16 15:49:13 +03:00
commit 780babc06a

View file

@ -217,7 +217,8 @@ row_sel_sec_rec_is_for_clust_rec(
len = clust_len;
if (ifield->prefix_len > 0 && len != UNIV_SQL_NULL) {
if (ifield->prefix_len > 0 && len != UNIV_SQL_NULL
&& sec_len != UNIV_SQL_NULL) {
if (rec_offs_nth_extern(clust_offs, clust_pos)) {
len -= BTR_EXTERN_FIELD_REF_SIZE;