IB: ulint compilation fixes

storage/innobase/include/trx0trx.h

@@ -1305,6 +1305,15 @@ struct trx_t {
 		return(assign_temp_rseg());
 	}
 
+	void init_start_time()
+	{
+		ulint secs;
+		ulint usecs;
+		ut_usectime(&secs, &usecs);
+		start_time = secs;
+		start_time_micro = usecs + (ib_uint64_t) secs * 1000000;
+	}
+
 private:
 	/** Assign a rollback segment for modifying temporary tables.
 	@return the assigned rollback segment */

storage/innobase/trx/trx0purge.cc

@@ -180,9 +180,7 @@ trx_purge_graph_build(sess_t* sess)
 	ut_ad(trx->sess == sess);
 
 	trx->id = 0;
-	ut_usectime((ulong *)&trx->start_time,
-		(ulong *)&trx->start_time_micro);
-	trx->start_time_micro += trx->start_time * 1000000;
+	trx->init_start_time();
 	trx->state = TRX_STATE_ACTIVE;
 	trx->op_info = "purge trx";
 

storage/innobase/trx/trx0trx.cc

@@ -869,9 +869,7 @@ trx_resurrect_insert(
 	if (trx->state == TRX_STATE_ACTIVE
 	    || trx->state == TRX_STATE_PREPARED) {
 
-		ut_usectime((ulong *)&trx->start_time,
-			(ulong *)&trx->start_time_micro);
-		trx->start_time_micro += trx->start_time * 1000000;
+		trx->init_start_time();
 	}
 
 	if (undo->dict_operation) {
@@ -961,9 +959,7 @@ trx_resurrect_update(
 	start time here.*/
 	if (trx->state == TRX_STATE_ACTIVE
 	    || trx->state == TRX_STATE_PREPARED) {
-		ut_usectime((ulong *)&trx->start_time,
-			(ulong *)&trx->start_time_micro);
-		trx->start_time_micro += trx->start_time * 1000000;
+		trx->init_start_time();
 	}
 
 	if (undo->dict_operation) {
@@ -1339,9 +1335,7 @@ trx_start_low(
 		trx->start_time = trx->start_time_micro / 1000000;
 
 	} else {
-		ut_usectime((ulong *)&trx->start_time,
-			(ulong *)&trx->start_time_micro);
-		trx->start_time_micro += trx->start_time * 1000000;
+		trx->init_start_time();
 	}
 
 	ut_a(trx->error_state == DB_SUCCESS);

storage/innobase/vers/vers0vtq.cc

@@ -228,7 +228,7 @@ operator< (const timeval &a, const timeval &b)
 static
 trx_id_t
 read_trx_id(const rec_t *rec) {
-	ulong len = 0;
+	ulint len = 0;
 	const rec_t *field = rec_get_nth_field_old(rec, 1, &len);
 	DBUG_ASSERT(len == 8);
 	return mach_read_from_8(field);