Remove duplicate printing of row lock counts in SHOW INNODB STATUS, and in

the remaining print, add a comma so it doesn't get combined with the heap
size. Both problems were introduced in r383.

lock/lock0lock.c

@@ -4391,10 +4391,6 @@ loop:
 					trx->read_view->up_limit_id));
 		}
 
-		fprintf(file,
-			"Trx has approximately %lu row locks\n",
-			(ulong) lock_number_of_rows_locked(trx));
-
 		if (trx->que_state == TRX_QUE_LOCK_WAIT) {
 			fprintf(file,
 				"------- TRX HAS BEEN WAITING %lu SEC"

trx/trx0trx.c

@@ -1761,11 +1761,10 @@ trx_print(
 	    || mem_heap_get_size(trx->lock_heap) > 400) {
 		newline = TRUE;
 
-		fprintf(f, "%lu lock struct(s), heap size %lu",
+		fprintf(f, "%lu lock struct(s), heap size %lu,"
+			" %lu row lock(s)",
 			(ulong) UT_LIST_GET_LEN(trx->trx_locks),
-			(ulong) mem_heap_get_size(trx->lock_heap));
-
-		fprintf(f, "%lu row lock(s)",
+			(ulong) mem_heap_get_size(trx->lock_heap),
 			(ulong) lock_number_of_rows_locked(trx));
 	}