1 files changed, 11 insertions, 10 deletions

diff --git a/storage/innobase/row/row0quiesce.cc b/storage/innobase/row/row0quiesce.cc
index b80b387b0fa..94a372bd046 100644
--- a/storage/innobase/row/row0quiesce.cc
+++ b/storage/innobase/row/row0quiesce.cc
@@ -142,7 +142,7 @@ row_quiesce_write_indexes(
 		mach_write_to_8(ptr, index->id);
 		ptr += sizeof(index_id_t);
 
-		mach_write_to_4(ptr, index->space);
+		mach_write_to_4(ptr, table->space_id);
 		ptr += sizeof(ib_uint32_t);
 
 		mach_write_to_4(ptr, index->page);
@@ -240,7 +240,7 @@ row_quiesce_write_table(
 		This field is also redundant, because the lengths
 		are a property of the character set encoding, which
 		in turn is encodedin prtype above. */
-		mach_write_to_4(ptr, col->mbmaxlen * 5 + col->mbminlen);
+		mach_write_to_4(ptr, ulint(col->mbmaxlen * 5 + col->mbminlen));
 		ptr += sizeof(ib_uint32_t);
 
 		mach_write_to_4(ptr, col->ind);
@@ -391,7 +391,7 @@ row_quiesce_write_header(
 	byte*		ptr = row;
 
 	/* Write the system page size. */
-	mach_write_to_4(ptr, UNIV_PAGE_SIZE);
+	mach_write_to_4(ptr, srv_page_size);
 	ptr += sizeof(ib_uint32_t);
 
 	/* Write the table->flags. */
@@ -518,15 +518,15 @@ row_quiesce_table_start(
 
 	ut_a(trx->mysql_thd != 0);
 
-	ut_ad(fil_space_get(table->space) != NULL);
+	ut_ad(table->space != NULL);
 	ib::info() << "Sync to disk of " << table->name << " started.";
 
 	if (srv_undo_sources) {
-		trx_purge_stop();
+		purge_sys.stop();
 	}
 
 	for (ulint count = 0;
-	     ibuf_merge_space(table->space) != 0
+	     ibuf_merge_space(table->space_id) != 0
 	     && !trx_is_interrupted(trx);
 	     ++count) {
 		if (!(count % 20)) {
@@ -538,7 +538,8 @@ row_quiesce_table_start(
 	if (!trx_is_interrupted(trx)) {
 		{
 			FlushObserver observer(table->space, trx, NULL);
-			buf_LRU_flush_or_remove_pages(table->space, &observer);
+			buf_LRU_flush_or_remove_pages(table->space_id,
+						      &observer);
 		}
 
 		if (trx_is_interrupted(trx)) {
@@ -605,7 +606,7 @@ row_quiesce_table_complete(
 	}
 
 	if (srv_undo_sources) {
-		trx_purge_run();
+		purge_sys.resume();
 	}
 
 	dberr_t	err = row_quiesce_set_state(table, QUIESCE_NONE, trx);
@@ -631,13 +632,13 @@ row_quiesce_set_state(
 
 		return(DB_UNSUPPORTED);
 
-	} else if (dict_table_is_temporary(table)) {
+	} else if (table->is_temporary()) {
 
 		ib_senderrf(trx->mysql_thd, IB_LOG_LEVEL_WARN,
 			    ER_CANNOT_DISCARD_TEMPORARY_TABLE);
 
 		return(DB_UNSUPPORTED);
-	} else if (table->space == TRX_SYS_SPACE) {
+	} else if (table->space_id == TRX_SYS_SPACE) {
 
 		char	table_name[MAX_FULL_NAME_LEN + 1];