Merge mysql-5.1 to mysql-5.5.

553988a2 · Marko Mäkelä · 49ffda09 · fb2a2d25 · 553988a2
Commit 553988a2 authored Aug 16, 2013 by Marko Mäkelä
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

storage/innobase/row/row0sel.c storage/innobase/row/row0sel.c +2 -1

No files found.
--- 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;