diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2013-08-16 15:49:13 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2013-08-16 15:49:13 +0300 |
| commit | 553988a26e6949238ae4d776cc1f2ad310cf8cc9 (patch) | |
| tree | fc4ee8456d57bc9b9cb33f6eec5d4cca501c337f /storage | |
| parent | 49ffda0969352545441ea16034851fef0f0e62be (diff) | |
| parent | fb2a2d25625f54eab60ff902ab667efbd7891ee5 (diff) | |
| download | mariadb-git-553988a26e6949238ae4d776cc1f2ad310cf8cc9.tar.gz | |
Merge mysql-5.1 to mysql-5.5.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/row/row0sel.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/innobase/row/row0sel.c b/storage/innobase/row/row0sel.c index e4c7e37307b..518eba975ab 100644 --- a/storage/innobase/row/row0sel.c +++ b/storage/innobase/row/row0sel.c @@ -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; |