bzr push into mysql-trunk-wl6255 branch (marko.makela:4012 to 4013) WL#6255

[marko.makela]

 4013 Marko Mäkelä	2012-06-21
      WL#6255 review fixes.
      
      Adjust the comments of row_merge_dup_t when it is not being used for
      detecting and reporting duplicates, but rather as a collection of
      data structures related to creating an index or rebuilding a table.

    modified:
      storage/innobase/include/row0ftsort.h
      storage/innobase/include/row0merge.h
      storage/innobase/row/row0ftsort.cc
      storage/innobase/row/row0merge.cc
 4012 Marko Mäkelä	2012-06-21
      WL#6255 dead code removal.
      
      row_rec_to_index_entry(): Remove the constant parameter type=ROW_COPY_DATA.

    modified:
      storage/innobase/btr/btr0cur.cc
      storage/innobase/include/row0row.h
      storage/innobase/row/row0mysql.cc
      storage/innobase/row/row0row.cc
      storage/innobase/row/row0upd.cc
      storage/innobase/trx/trx0rec.cc
=== modified file 'storage/innobase/include/row0ftsort.h'
--- a/storage/innobase/include/row0ftsort.h	revid:marko.makela@strippedbyase2k2ow
+++ b/storage/innobase/include/row0ftsort.h	revid:marko.makela@strippeda5
@@ -60,7 +60,7 @@ struct fts_psort_t;
 
 /** Common info passed to each parallel sort thread */
 struct fts_psort_common_t {
-	row_merge_dup_t*	dup;		/*!< FTS index */
+	row_merge_dup_t*	dup;		/*!< descriptor of FTS index */
 	dict_table_t*		new_table;	/*!< source table */
 	trx_t*			trx;		/*!< transaction */
 	fts_psort_t*		all_info;	/*!< all parallel sort info */
@@ -168,7 +168,8 @@ ibool
 row_fts_psort_info_init(
 /*====================*/
 	trx_t*			trx,	/*!< in: transaction */
-	row_merge_dup_t*	dup,	/*!< in,own: FTS index being created */
+	row_merge_dup_t*	dup,	/*!< in,own: descriptor of
+					FTS index being created */
 	const dict_table_t*	new_table,/*!< in: table where indexes are
 					created */
 	ibool			opt_doc_id_size,

=== 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@stripped
@@ -375,7 +375,8 @@ dberr_t
 row_merge_sort(
 /*===========*/
 	trx_t*			trx,	/*!< in: transaction */
-	const row_merge_dup_t*	dup,	/*!< in: index being created */
+	const row_merge_dup_t*	dup,	/*!< in: descriptor of
+					index being created */
 	merge_file_t*		file,	/*!< in/out: file containing
 					index entries */
 	row_merge_block_t*	block,	/*!< in/out: 3 buffers */

=== modified file 'storage/innobase/row/row0ftsort.cc'
--- a/storage/innobase/row/row0ftsort.cc	revid:marko.makela@strippedase2k2ow
+++ b/storage/innobase/row/row0ftsort.cc	revid:marko.makela@stripped
@@ -171,7 +171,8 @@ ibool
 row_fts_psort_info_init(
 /*====================*/
 	trx_t*			trx,	/*!< in: transaction */
-	row_merge_dup_t*	dup,	/*!< in,own: FTS index being created */
+	row_merge_dup_t*	dup,	/*!< in,own: descriptor of
+					FTS index being created */
 	const dict_table_t*	new_table,/*!< in: table on which indexes are
 					created */
 	ibool			opt_doc_id_size,

=== modified file 'storage/innobase/row/row0merge.cc'
--- a/storage/innobase/row/row0merge.cc	revid:marko.makela@stripped14-86l8m5byase2k2ow
+++ b/storage/innobase/row/row0merge.cc	revid:marko.makela@strippedvy944a5
@@ -1802,7 +1802,8 @@ static __attribute__((nonnull, warn_unus
 dberr_t
 row_merge_blocks(
 /*=============*/
-	const row_merge_dup_t*	dup,	/*!< in: index being created */
+	const row_merge_dup_t*	dup,	/*!< in: descriptor of
+					index being created */
 	ulint			n_null,	/*!< in: size of the NULL-bit bitmap */
 	const merge_file_t*	file,	/*!< in: file containing
 					index entries */
@@ -1988,7 +1989,8 @@ dberr_t
 row_merge(
 /*======*/
 	trx_t*			trx,	/*!< in: transaction */
-	const row_merge_dup_t*	dup,	/*!< in: index being created */
+	const row_merge_dup_t*	dup,	/*!< in: descriptor of
+					index being created */
 	ulint			n_null,	/*!< in: size of the NULL-bit bitmap */
 	merge_file_t*		file,	/*!< in/out: file containing
 					index entries */
@@ -2118,7 +2120,8 @@ dberr_t
 row_merge_sort(
 /*===========*/
 	trx_t*			trx,	/*!< in: transaction */
-	const row_merge_dup_t*	dup,	/*!< in: index being created */
+	const row_merge_dup_t*	dup,	/*!< in: descriptor of
+					index being created */
 	merge_file_t*		file,	/*!< in/out: file containing
 					index entries */
 	row_merge_block_t*	block,	/*!< in/out: 3 buffers */

No bundle (reason: useless for push emails).