List:Commits« Previous MessageNext Message »
From:marko.makela Date:June 3 2012 8:01pm
Subject:bzr push into mysql-trunk-wl6255 branch (marko.makela:3931 to 3932) WL#6255
View as plain text  
 3932 Marko Mäkelä	2012-06-03
      WL#6255 cleanup in row0*.cc: Remove unused parameter altered_table.

    modified:
      storage/innobase/handler/handler0alter.cc
      storage/innobase/include/row0log.h
      storage/innobase/include/row0merge.h
      storage/innobase/row/row0log.cc
      storage/innobase/row/row0merge.cc
 3931 Marko Mäkelä	2012-06-02
      WL#6255 clean-up.
      
      innobase_convert_tablename(): Replace with innobase_convert_name().

    modified:
      storage/innobase/handler/handler0alter.cc
=== modified file 'storage/innobase/handler/handler0alter.cc'
--- a/storage/innobase/handler/handler0alter.cc	revid:marko.makela@stripped1-60os7wgsgqchii0k
+++ b/storage/innobase/handler/handler0alter.cc	revid:marko.makela@strippedc6jbgq6hvc9h7w
@@ -3165,8 +3165,7 @@ ok_exit:
 		prebuilt->trx,
 		prebuilt->table, ctx->indexed_table,
 		ctx->online,
-		ctx->add, ctx->add_key_numbers, ctx->num_to_add,
-		table, altered_table);
+		ctx->add, ctx->add_key_numbers, ctx->num_to_add, table);
 #ifndef DBUG_OFF
 oom:
 #endif /* !DBUG_OFF */
@@ -3174,7 +3173,7 @@ oom:
 	    && ctx->indexed_table != prebuilt->table) {
 		DEBUG_SYNC_C("row_log_table_apply1_before");
 		error = row_log_table_apply(
-			ctx->thr, prebuilt->table, table, altered_table);
+			ctx->thr, prebuilt->table, table);
 	}
 
 	/* After an error, remove all those index definitions
@@ -3754,7 +3753,7 @@ ha_innobase::commit_inplace_alter_table(
 			DEBUG_SYNC_C("row_log_table_apply2_before");
 			error = row_log_table_apply(
 				ctx->thr, prebuilt->table,
-				table, altered_table);
+				table);
 
 			switch (error) {
 				KEY*	dup_key;

=== modified file 'storage/innobase/include/row0log.h'
--- a/storage/innobase/include/row0log.h	revid:marko.makela@strippedgsgqchii0k
+++ b/storage/innobase/include/row0log.h	revid:marko.makela@stripped
@@ -176,10 +176,8 @@ row_log_table_apply(
 	que_thr_t*	thr,	/*!< in: query graph */
 	dict_table_t*	old_table,
 				/*!< in: old table */
-	struct TABLE*	table,	/*!< in/out: MySQL table
+	struct TABLE*	table)	/*!< in/out: MySQL table
 				(for reporting duplicates) */
-	struct TABLE*	altered_table)
-				/*!< in: new MySQL table definition */
 	__attribute__((nonnull, warn_unused_result));
 
 /******************************************************//**

=== modified file 'storage/innobase/include/row0merge.h'
--- a/storage/innobase/include/row0merge.h	revid:marko.makela@stripped
+++ b/storage/innobase/include/row0merge.h	revid:marko.makela@oracle.com-20120603164612-cdc6jbgq6hvc9h7w
@@ -290,11 +290,9 @@ row_merge_build_indexes(
 	dict_index_t**	indexes,	/*!< in: indexes to be created */
 	const ulint*	key_numbers,	/*!< in: MySQL key numbers */
 	ulint		n_indexes,	/*!< in: size of indexes[] */
-	struct TABLE*	table,		/*!< in/out: MySQL table, for
+	struct TABLE*	table)		/*!< in/out: MySQL table, for
 					reporting erroneous key value
 					if applicable */
-	struct TABLE*	altered_table)	/*!< in/out: new MySQL table
-					definition */
 	__attribute__((nonnull, warn_unused_result));
 /********************************************************************//**
 Write a buffer to a block. */

=== modified file 'storage/innobase/row/row0log.cc'
--- a/storage/innobase/row/row0log.cc	revid:marko.makela@strippedgqchii0k
+++ b/storage/innobase/row/row0log.cc	revid:marko.makela@stripped
@@ -1012,8 +1012,6 @@ row_log_table_apply_convert_mrec(
 	mem_heap_t*		heap,		/*!< in/out: memory heap */
 	dict_table_t*		new_table,	/*!< in/out: table
 						being rebuilt */
-	const struct TABLE*	altered_table,	/*!< in: new MySQL
-						table definition */
 	dberr_t*		error)		/*!< out: DB_SUCCESS or
 						reason of failure */
 {
@@ -1104,8 +1102,6 @@ row_log_table_apply_insert_low(
 	mem_heap_t*		heap,		/*!< in/out: memory heap */
 	dict_table_t*		new_table,	/*!< in/out: table
 						being rebuilt */
-	const struct TABLE*	altered_table,	/*!< in: new MySQL
-						table definition */
 	row_merge_dup_t*	dup)		/*!< in/out: for reporting
 						duplicate key errors */
 {
@@ -1173,22 +1169,19 @@ row_log_table_apply_insert(
 	mem_heap_t*		heap,		/*!< in/out: memory heap */
 	dict_table_t*		new_table,	/*!< in/out: table
 						being rebuilt */
-	const struct TABLE*	altered_table,	/*!< in: new MySQL
-						table definition */
 	row_merge_dup_t*	dup)		/*!< in/out: for reporting
 						duplicate key errors */
 {
 	dberr_t		error;
 	const dtuple_t*	row	= row_log_table_apply_convert_mrec(
-		mrec, dup->index, offsets, heap, new_table, altered_table,
+		mrec, dup->index, offsets, heap, new_table,
 		&error);
 
 	ut_ad(!row == (error != DB_SUCCESS));
 
 	if (row) {
 		error = row_log_table_apply_insert_low(
-			thr, row, offsets_heap, heap,
-			new_table, altered_table, dup);
+			thr, row, offsets_heap, heap, new_table, dup);
 	}
 
 	if (error != DB_SUCCESS) {
@@ -1403,8 +1396,6 @@ row_log_table_apply_update(
 	mem_heap_t*		heap,		/*!< in/out: memory heap */
 	dict_table_t*		new_table,	/*!< in/out: table
 						being rebuilt */
-	const struct TABLE*	altered_table,	/*!< in: new MySQL
-						table definition */
 	row_merge_dup_t*	dup,		/*!< in/out: for reporting
 						duplicate key errors */
 	const dtuple_t*		old_pk)		/*!< in: PRIMARY KEY and
@@ -1425,8 +1416,7 @@ row_log_table_apply_update(
 	      + (dup->index->online_log->same_pk ? 0 : 2));
 
 	row = row_log_table_apply_convert_mrec(
-		mrec, dup->index, offsets, heap,
-		new_table, altered_table, &error);
+		mrec, dup->index, offsets, heap, new_table, &error);
 
 	ut_ad(!row == (error != DB_SUCCESS));
 
@@ -1457,8 +1447,7 @@ row_log_table_apply_update(
 insert:
 		/* The row was not found. Insert it. */
 		error = row_log_table_apply_insert_low(
-			thr, row, offsets_heap, heap,
-			new_table, altered_table, dup);
+			thr, row, offsets_heap, heap, new_table, dup);
 
 		if (error != DB_SUCCESS) {
 err_exit:
@@ -1658,8 +1647,6 @@ row_log_table_apply_op(
 						DB_TRX_ID in new index */
 	dict_table_t*		new_table,	/*!< in/out: table
 						being rebuilt */
-	const struct TABLE*	altered_table,	/*!< in: new MySQL
-						table definition */
 	row_merge_dup_t*	dup,		/*!< in/out: for reporting
 						duplicate key errors */
 	dberr_t*		error,		/*!< out: DB_SUCCESS
@@ -1725,8 +1712,7 @@ row_log_table_apply_op(
 				    trx_read_trx_id(db_trx_id))) {
 				*error = row_log_table_apply_insert(
 					thr, mrec, offsets, offsets_heap,
-					heap,
-					new_table, altered_table, dup);
+					heap, new_table, dup);
 			}
 		}
 		break;
@@ -1896,7 +1882,7 @@ row_log_table_apply_op(
 				*error = row_log_table_apply_update(
 					thr, trx_id_col, new_trx_id_col,
 					mrec, offsets, offsets_heap, heap,
-					new_table, altered_table, dup, old_pk);
+					new_table, dup, old_pk);
 			}
 		}
 
@@ -1916,8 +1902,6 @@ dberr_t
 row_log_table_apply_ops(
 /*====================*/
 	que_thr_t*	thr,	/*!< in: query graph */
-	struct TABLE*	altered_table,
-				/*!< in: new MySQL table definition */
 	row_merge_dup_t*dup)	/*!< in/out: for reporting duplicate key
 				errors */
 {
@@ -2092,7 +2076,7 @@ all_done:
 		       (&index->online_log->head.buf)[1] - mrec_end);
 		mrec = row_log_table_apply_op(
 			thr, trx_id_col, new_trx_id_col,
-			index->online_log->table, altered_table,
+			index->online_log->table,
 			dup, &error, offsets_heap, heap,
 			index->online_log->head.buf,
 			(&index->online_log->head.buf)[1], offsets);
@@ -2191,7 +2175,7 @@ all_done:
 
 		next_mrec = row_log_table_apply_op(
 			thr, trx_id_col, new_trx_id_col,
-			index->online_log->table, altered_table,
+			index->online_log->table,
 			dup, &error, offsets_heap, heap,
 			mrec, mrec_end, offsets);
 
@@ -2258,10 +2242,8 @@ row_log_table_apply(
 	que_thr_t*	thr,	/*!< in: query graph */
 	dict_table_t*	old_table,
 				/*!< in: old table */
-	struct TABLE*	table,	/*!< in/out: MySQL table
+	struct TABLE*	table)	/*!< in/out: MySQL table
 				(for reporting duplicates) */
-	struct TABLE*	altered_table)
-				/*!< in: new MySQL table definition */
 {
 	dberr_t		error;
 	dict_index_t*	clust_index;
@@ -2288,8 +2270,7 @@ row_log_table_apply(
 		ut_ad(0);
 		error = DB_ERROR;
 	} else {
-		error = row_log_table_apply_ops(
-			thr, altered_table, &dup);
+		error = row_log_table_apply_ops(thr, &dup);
 	}
 
 	rw_lock_x_unlock(dict_index_get_lock(clust_index));

=== modified file 'storage/innobase/row/row0merge.cc'
--- a/storage/innobase/row/row0merge.cc	revid:marko.makela@strippedi0k
+++ b/storage/innobase/row/row0merge.cc	revid:marko.makela@stripped
@@ -3231,11 +3231,9 @@ row_merge_build_indexes(
 	dict_index_t**	indexes,	/*!< in: indexes to be created */
 	const ulint*	key_numbers,	/*!< in: MySQL key numbers */
 	ulint		n_indexes,	/*!< in: size of indexes[] */
-	struct TABLE*	table,		/*!< in/out: MySQL table, for
+	struct TABLE*	table)		/*!< in/out: MySQL table, for
 					reporting erroneous key value
 					if applicable */
-	struct TABLE*	altered_table)	/*!< in/out: new MySQL table
-					definition */
 {
 	merge_file_t*		merge_files;
 	row_merge_block_t*	block;

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-wl6255 branch (marko.makela:3931 to 3932) WL#6255marko.makela11 Jun