branches/zip:

 
Make lock_get_type_str() to also indicate if it is a gap lock.
 
Suggested by:	Heikki
Approved by:	Marko

handler/i_s.cc

@@ -416,7 +416,8 @@ static ST_FIELD_INFO	innodb_locks_fields_info[] =
 
 #define IDX_LOCK_MODE		2
 	{STRUCT_FLD(field_name,		"lock_mode"),
-	 STRUCT_FLD(field_length,	32 /* S|X|IS|IX|AUTO_INC|UNKNOWN */),
+	 /* S[,GAP] X[,GAP] IS[,GAP] IX[,GAP] AUTO_INC UNKNOWN */
+	 STRUCT_FLD(field_length,	32),
 	 STRUCT_FLD(field_type,		MYSQL_TYPE_STRING),
 	 STRUCT_FLD(value,		0),
 	 STRUCT_FLD(field_flags,	0),

lock/lock0lock.c

@@ -5382,15 +5382,36 @@ lock_get_mode_str(
 				/* out: lock mode */
 	const lock_t*	lock)	/* in: lock */
 {
+	ibool	is_gap_lock;
+
+	is_gap_lock = lock_get_type_low(lock) == LOCK_REC
+		&& lock_rec_get_gap(lock);
+
 	switch (lock_get_mode(lock)) {
 	case LOCK_S:
-		return("S");
+		if (is_gap_lock) {
+			return("S,GAP");
+		} else {
+			return("S");
+		}
 	case LOCK_X:
-		return("X");
+		if (is_gap_lock) {
+			return("X,GAP");
+		} else {
+			return("X");
+		}
 	case LOCK_IS:
-		return("IS");
+		if (is_gap_lock) {
+			return("IS,GAP");
+		} else {
+			return("IS");
+		}
 	case LOCK_IX:
-		return("IX");
+		if (is_gap_lock) {
+			return("IX,GAP");
+		} else {
+			return("IX");
+		}
 	case LOCK_AUTO_INC:
 		return("AUTO_INC");
 	default: