ut0mem.c Merge changes in InnoDB-3.23.43b

ut0ut.c 	Merge changes in InnoDB-3.23.43b
trx0purge.c	Merge changes in InnoDB-3.23.43b
trx0rec.c	Merge changes in InnoDB-3.23.43b
trx0trx.c	Merge changes in InnoDB-3.23.43b
trx0undo.c	Merge changes in InnoDB-3.23.43b
thr0loc.c	Merge changes in InnoDB-3.23.43b
sync0arr.c	Merge changes in InnoDB-3.23.43b
sync0rw.c	Merge changes in InnoDB-3.23.43b
sync0sync.c	Merge changes in InnoDB-3.23.43b
srv0srv.c	Merge changes in InnoDB-3.23.43b
srv0start.c	Merge changes in InnoDB-3.23.43b
row0ins.c	Merge changes in InnoDB-3.23.43b
row0mysql.c	Merge changes in InnoDB-3.23.43b
row0purge.c	Merge changes in InnoDB-3.23.43b
row0sel.c	Merge changes in InnoDB-3.23.43b
row0umod.c	Merge changes in InnoDB-3.23.43b
row0upd.c	Merge changes in InnoDB-3.23.43b
row0vers.c	Merge changes in InnoDB-3.23.43b
rem0cmp.c	Merge changes in InnoDB-3.23.43b
que0que.c	Merge changes in InnoDB-3.23.43b
pars0opt.c	Merge changes in InnoDB-3.23.43b
pars0pars.c	Merge changes in InnoDB-3.23.43b
lexyy.c 	Merge changes in InnoDB-3.23.43b
pars0grm.c	Merge changes in InnoDB-3.23.43b
page0page.c	Merge changes in InnoDB-3.23.43b
os0file.c	Merge changes in InnoDB-3.23.43b
mtr0log.c	Merge changes in InnoDB-3.23.43b
mem0pool.c	Merge changes in InnoDB-3.23.43b
log0log.c	Merge changes in InnoDB-3.23.43b
log0recv.c	Merge changes in InnoDB-3.23.43b
lock0lock.c	Merge changes in InnoDB-3.23.43b
ibuf0ibuf.c	Merge changes in InnoDB-3.23.43b
fil0fil.c	Merge changes in InnoDB-3.23.43b
dict0crea.c	Merge changes in InnoDB-3.23.43b
dict0dict.c	Merge changes in InnoDB-3.23.43b
dict0load.c	Merge changes in InnoDB-3.23.43b
dict0mem.c	Merge changes in InnoDB-3.23.43b
data0data.c	Merge changes in InnoDB-3.23.43b
data0type.c	Merge changes in InnoDB-3.23.43b
buf0buf.c	Merge changes in InnoDB-3.23.43b
buf0lru.c	Merge changes in InnoDB-3.23.43b
btr0btr.c	Merge changes in InnoDB-3.23.43b
btr0cur.c	Merge changes in InnoDB-3.23.43b
btr0pcur.c	Merge changes in InnoDB-3.23.43b
btr0sea.c	Merge changes in InnoDB-3.23.43b
data0type.ic	Merge changes in InnoDB-3.23.43b
dict0dict.ic	Merge changes in InnoDB-3.23.43b
mtr0mtr.ic	Merge changes in InnoDB-3.23.43b
row0upd.ic	Merge changes in InnoDB-3.23.43b
sync0ipm.ic	Merge changes in InnoDB-3.23.43b
sync0rw.ic	Merge changes in InnoDB-3.23.43b
sync0sync.ic	Merge changes in InnoDB-3.23.43b
trx0rseg.ic	Merge changes in InnoDB-3.23.43b
btr0pcur.ic	Merge changes in InnoDB-3.23.43b
buf0buf.ic	Merge changes in InnoDB-3.23.43b
data0data.ic	Merge changes in InnoDB-3.23.43b
row0upd.h	Merge changes in InnoDB-3.23.43b
srv0srv.h	Merge changes in InnoDB-3.23.43b
sync0arr.h	Merge changes in InnoDB-3.23.43b
sync0rw.h	Merge changes in InnoDB-3.23.43b
sync0sync.h	Merge changes in InnoDB-3.23.43b
trx0trx.h	Merge changes in InnoDB-3.23.43b
ut0mem.h	Merge changes in InnoDB-3.23.43b
data0data.h	Merge changes in InnoDB-3.23.43b
data0type.h	Merge changes in InnoDB-3.23.43b
db0err.h	Merge changes in InnoDB-3.23.43b
dict0crea.h	Merge changes in InnoDB-3.23.43b
dict0dict.h	Merge changes in InnoDB-3.23.43b
dict0load.h	Merge changes in InnoDB-3.23.43b
dict0mem.h	Merge changes in InnoDB-3.23.43b
dict0types.h	Merge changes in InnoDB-3.23.43b
fil0fil.h	Merge changes in InnoDB-3.23.43b
ibuf0ibuf.h	Merge changes in InnoDB-3.23.43b
lock0lock.h	Merge changes in InnoDB-3.23.43b
log0log.h	Merge changes in InnoDB-3.23.43b
mtr0mtr.h	Merge changes in InnoDB-3.23.43b
rem0cmp.h	Merge changes in InnoDB-3.23.43b
row0ins.h	Merge changes in InnoDB-3.23.43b
row0mysql.h	Merge changes in InnoDB-3.23.43b
btr0cur.h	Merge changes in InnoDB-3.23.43b
btr0pcur.h	Merge changes in InnoDB-3.23.43b
btr0sea.h	Merge changes in InnoDB-3.23.43b
buf0buf.h	Merge changes in InnoDB-3.23.43b
sql_table.cc	Merge changes in InnoDB-3.23.43b
sql_db.cc	Merge changes in InnoDB-3.23.43b
ha_innobase.cc	Merge changes in InnoDB-3.23.43b
handler.cc	Merge changes in InnoDB-3.23.43b
ha_innobase.h	Merge changes in InnoDB-3.23.43b
handler.h	Merge changes in InnoDB-3.23.43b

4 files changed, 48 insertions, 5 deletions

diff --git a/innobase/trx/trx0purge.c b/innobase/trx/trx0purge.c
index afb83926fa3..c50ffb65e00 100644
--- a/innobase/trx/trx0purge.c
+++ b/innobase/trx/trx0purge.c
@@ -276,6 +276,12 @@ trx_purge_add_update_undo_to_history(
 	if (undo->state != TRX_UNDO_CACHED) {
 		/* The undo log segment will not be reused */
 
+		if (undo->id >= TRX_RSEG_N_SLOTS) {
+			fprintf(stderr,
+			"InnoDB: Error: undo->id is %lu\n", undo->id);
+			ut_a(0);
+		}
+
 		trx_rsegf_set_nth_undo(rseg_header, undo->id, FIL_NULL, mtr);
 
 		hist_size = mtr_read_ulint(rseg_header + TRX_RSEG_HISTORY_SIZE,
diff --git a/innobase/trx/trx0rec.c b/innobase/trx/trx0rec.c
index 64febb8f523..73153cfaa37 100644
--- a/innobase/trx/trx0rec.c
+++ b/innobase/trx/trx0rec.c
@@ -800,7 +800,7 @@ trx_undo_update_rec_get_update(
 				TRX_UNDO_DEL_MARK_REC; in the last case,
 				only trx id and roll ptr fields are added to
 				the update vector */
-	dulint		trx_id,	/* in: transaction id from this undorecord */
+	dulint		trx_id,	/* in: transaction id from this undo record */
 	dulint		roll_ptr,/* in: roll pointer from this undo record */
 	ulint		info_bits,/* in: info bits from this undo record */
 	mem_heap_t*	heap,	/* in: memory heap from which the memory
@@ -1078,9 +1078,7 @@ trx_undo_report_row_operation(
 		undo_page = buf_page_get_gen(undo->space, page_no,
 						RW_X_LATCH, undo->guess_page,
 						BUF_GET,
-						#ifdef UNIV_SYNC_DEBUG
 						IB__FILE__, __LINE__,
-						#endif
 						&mtr);
 
 		buf_page_dbg_add_level(undo_page, SYNC_TRX_UNDO_PAGE);
@@ -1282,7 +1280,7 @@ trx_undo_prev_version_build(
 		return(DB_SUCCESS);
 	}
 
-	rec_trx_id = row_get_rec_trx_id(rec, index);
+ 	rec_trx_id = row_get_rec_trx_id(rec, index);
 	
 	err = trx_undo_get_undo_rec(roll_ptr, rec_trx_id, &undo_rec, heap);
 
diff --git a/innobase/trx/trx0trx.c b/innobase/trx/trx0trx.c
index 5d8c57edf34..13b37775dce 100644
--- a/innobase/trx/trx0trx.c
+++ b/innobase/trx/trx0trx.c
@@ -109,7 +109,10 @@ trx_create(
 	UT_LIST_INIT(trx->trx_locks);
 
 	trx->has_search_latch = FALSE;
+	trx->search_latch_timeout = BTR_SEA_TIMEOUT;
 
+	trx->auto_inc_lock = NULL;
+	
 	trx->read_view_heap = mem_heap_create(256);
 	trx->read_view = NULL;
 
@@ -193,6 +196,7 @@ trx_free(
 	ut_a(UT_LIST_GET_LEN(trx->wait_thrs) == 0);
 
 	ut_a(!trx->has_search_latch);
+	ut_a(!trx->auto_inc_lock);
 
 	if (trx->lock_heap) {
 		mem_heap_free(trx->lock_heap);
diff --git a/innobase/trx/trx0undo.c b/innobase/trx/trx0undo.c
index 1f408428582..598090bdee2 100644
--- a/innobase/trx/trx0undo.c
+++ b/innobase/trx/trx0undo.c
@@ -361,6 +361,8 @@ trx_undo_page_init(
 	mach_write_to_2(page_hdr + TRX_UNDO_PAGE_FREE,
 				TRX_UNDO_PAGE_HDR + TRX_UNDO_PAGE_HDR_SIZE);
 
+	fil_page_set_type(undo_page, FIL_PAGE_UNDO_LOG);
+				
 	trx_undo_page_init_log(undo_page, type, mtr);
 }
 
@@ -1106,6 +1108,12 @@ trx_undo_mem_create_at_db_start(
 	page_t*		last_page;
 	trx_undo_rec_t*	rec;
 	
+	if (id >= TRX_RSEG_N_SLOTS) {
+		fprintf(stderr,
+		"InnoDB: Error: undo->id is %lu\n", id);
+		ut_a(0);
+	}
+
 	undo_page = trx_undo_page_get(rseg->space, page_no, mtr);
 
 	page_header = undo_page + TRX_UNDO_PAGE_HDR;
@@ -1251,7 +1259,13 @@ trx_undo_mem_create(
 	trx_undo_t*	undo;
 
 	ut_ad(mutex_own(&(rseg->mutex)));
-	
+
+	if (id >= TRX_RSEG_N_SLOTS) {
+		fprintf(stderr,
+		"InnoDB: Error: undo->id is %lu\n", id);
+		ut_a(0);
+	}
+
 	undo = mem_alloc(sizeof(trx_undo_t));
 
 	undo->id = id;
@@ -1290,6 +1304,12 @@ trx_undo_mem_init_for_reuse(
 {
 	ut_ad(mutex_own(&((undo->rseg)->mutex)));
 	
+	if (undo->id >= TRX_RSEG_N_SLOTS) {
+		fprintf(stderr,
+		"InnoDB: Error: undo->id is %lu\n", undo->id);
+		ut_a(0);
+	}
+
 	undo->state = TRX_UNDO_ACTIVE;
 	undo->del_marks = FALSE;
 	undo->trx_id = trx_id;
@@ -1308,6 +1328,12 @@ trx_undo_mem_free(
 /*==============*/
 	trx_undo_t*	undo)	/* in: the undo object to be freed */
 {
+	if (undo->id >= TRX_RSEG_N_SLOTS) {
+		fprintf(stderr,
+		"InnoDB: Error: undo->id is %lu\n", undo->id);
+		ut_a(0);
+	}
+
 	mem_free(undo);
 }
 
@@ -1493,6 +1519,9 @@ trx_undo_assign_undo(
 			mutex_exit(&(rseg->mutex));
 			mtr_commit(&mtr);
 
+			fprintf(stderr,	"InnoDB: no undo log slots free\n");
+			ut_a(0);
+
 			return(NULL);
 		}
 	}
@@ -1536,6 +1565,12 @@ trx_undo_set_state_at_finish(
 	
 	ut_ad(trx && undo && mtr);
 
+	if (undo->id >= TRX_RSEG_N_SLOTS) {
+		fprintf(stderr,
+		"InnoDB: Error: undo->id is %lu\n", undo->id);
+		ut_a(0);
+	}
+
 	undo_page = trx_undo_page_get(undo->space, undo->hdr_page_no, mtr);
 
 	seg_hdr = undo_page + TRX_UNDO_SEG_HDR;