4 files changed, 6 insertions, 14 deletions
diff --git a/innobase/trx/trx0rec.c b/innobase/trx/trx0rec.c
index fcb7582ce73..3f3cfd3b000 100644
--- a/innobase/trx/trx0rec.c
+++ b/innobase/trx/trx0rec.c
@@ -1134,7 +1134,7 @@ trx_undo_report_row_operation(
 
 			mutex_exit(&(trx->undo_mutex));
 			mtr_commit(&mtr);
-			if (heap) {
+			if (UNIV_LIKELY_NULL(heap)) {
 				mem_heap_free(heap);
 			}
 			return(DB_OUT_OF_FILE_SPACE);
@@ -1153,7 +1153,7 @@ trx_undo_report_row_operation(
 
 	*roll_ptr = trx_undo_build_roll_ptr(is_insert, rseg->id, page_no,
 								offset);
-	if (heap) {
+	if (UNIV_LIKELY_NULL(heap)) {
 		mem_heap_free(heap);
 	}
 	return(DB_SUCCESS);
diff --git a/innobase/trx/trx0roll.c b/innobase/trx/trx0roll.c
index 69f7a99187f..fdfb7428129 100644
--- a/innobase/trx/trx0roll.c
+++ b/innobase/trx/trx0roll.c
@@ -1237,10 +1237,12 @@ trx_finish_rollback_off_kernel(
 		return;
 	}
 
+#ifdef UNIV_DEBUG
 	if (lock_print_waits) {			
 		fprintf(stderr, "Trx %lu rollback finished\n",
 						(ulong) ut_dulint_get_low(trx->id));
 	}
+#endif /* UNIV_DEBUG */
 
 	trx_commit_off_kernel(trx);
 
diff --git a/innobase/trx/trx0trx.c b/innobase/trx/trx0trx.c
index c6d1f953772..9e155ee1de0 100644
--- a/innobase/trx/trx0trx.c
+++ b/innobase/trx/trx0trx.c
@@ -158,8 +158,6 @@ trx_create(
 	trx->n_tickets_to_enter_innodb = 0;
 
 	trx->auto_inc_lock = NULL;
-	trx->n_lock_table_exp = 0;
-	trx->n_lock_table_transactional = 0;
 	
 	trx->read_view_heap = mem_heap_create(256);
 	trx->read_view = NULL;
@@ -309,8 +307,6 @@ trx_free(
 
 	ut_a(!trx->has_search_latch);
 	ut_a(!trx->auto_inc_lock);
-	ut_a(!trx->n_lock_table_exp);
-	ut_a(!trx->n_lock_table_transactional);
 
 	ut_a(trx->dict_operation_lock_mode == 0);
 
@@ -1711,12 +1707,6 @@ trx_print(
 					(ulong) trx->mysql_n_tables_locked);
 	}
 
-	if (trx->n_lock_table_transactional > 0 || trx->n_lock_table_exp > 0) {
-fprintf(f, "mysql explicit table locks %lu, transactional table locks %lu\n",
-				(ulong) trx->n_lock_table_exp,
-				(ulong) trx->n_lock_table_transactional);
-        }
-
 	newline = TRUE;
 
   	switch (trx->que_state) {
diff --git a/innobase/trx/trx0undo.c b/innobase/trx/trx0undo.c
index a519722aac7..7441dd3f152 100644
--- a/innobase/trx/trx0undo.c
+++ b/innobase/trx/trx0undo.c
@@ -556,7 +556,7 @@ void
 trx_undo_write_xid(
 /*===============*/
 	trx_ulogf_t*	log_hdr,/* in: undo log header */
-	XID*		xid,	/* in: X/Open XA Transaction Identification */
+	const XID*	xid,	/* in: X/Open XA Transaction Identification */
 	mtr_t*		mtr)	/* in: mtr */
 {
 	mlog_write_ulint(log_hdr + TRX_UNDO_XA_FORMAT,
@@ -568,7 +568,7 @@ trx_undo_write_xid(
 	mlog_write_ulint(log_hdr + TRX_UNDO_XA_BQUAL_LEN,
 			(ulint)xid->bqual_length, MLOG_4BYTES, mtr);
 
-	mlog_write_string(log_hdr + TRX_UNDO_XA_XID, xid->data,
+	mlog_write_string(log_hdr + TRX_UNDO_XA_XID, (const byte*) xid->data,
 							XIDDATASIZE, mtr);
 }