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

[marko.makela]

 3990 Marko Mäkelä	2012-06-18
      WL#6255 review fixes. Adjust comments and simplify an #ifdef.

    modified:
      storage/innobase/handler/handler0alter.cc
      storage/innobase/include/dict0dict.h
      storage/innobase/include/dict0dict.ic
      storage/innobase/include/mem0mem.ic
 3989 Marko Mäkelä	2012-06-18
      WL#6255 review fix: Correct a typo in a comment.

    modified:
      storage/innobase/include/row0merge.h
 3988 Marko Mäkel
    modified:
      sql/sql_table.cc
 3987 Marko Mäkel
      innobase_build_col_map(): Do not overwrite the FTS_DOC_ID mapping.

    modified:
      storage/innobase/handler/handler0alter.cc
=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc	revid:marko.makela@stripped0120618122450-29pn05td5hapd74c
+++ b/sql/sql_table.cc	revid:marko.makela@stripped8
@@ -5379,7 +5379,8 @@ static bool fill_alter_inplace_info(THD
   */
   for (f_ptr= table->field; (field= *f_ptr); f_ptr++)
   {
-    /* Clear marker for renamed field which we are going to set later. */
+    /* Clear marker for renamed or dropped field
+    which we are going to set later. */
     field->flags&= ~(FIELD_IS_RENAMED | FIELD_IS_DROPPED);
 
     /* Use transformed info to evaluate flags for storage engine. */

=== modified file 'storage/innobase/handler/handler0alter.cc'
--- a/storage/innobase/handler/handler0alter.cc	revid:marko.makela@stripped0120618122450-29pn05td5hapd74c
+++ b/storage/innobase/handler/handler0alter.cc	revid:marko.makela@stripped618203413-nxmwd82bxjw3zwe8
@@ -1998,8 +1998,8 @@ column that is being dropped or modified
 @param drop_fk		constraints being dropped
 @param n_drop_fk	number of constraints that are being dropped
 @param drop		true=drop column, false=set NOT NULL
-@retval true		Failure (will call my_error())
-@retval false		Success
+@retval true		Not allowed (will call my_error())
+@retval false		Allowed
 */
 static __attribute__((pure, nonnull, warn_unused_result))
 bool
@@ -2091,8 +2091,8 @@ column that is being dropped or modified
 @param user_table	InnoDB table as it is before the ALTER operation
 @param drop_fk		constraints being dropped
 @param n_drop_fk	number of constraints that are being dropped
-@retval true		Failure (will call my_error())
-@retval false		Success
+@retval true		Not allowed (will call my_error())
+@retval false		Allowed
 */
 static __attribute__((pure, nonnull, warn_unused_result))
 bool
@@ -2137,8 +2137,7 @@ innobase_check_foreigns(
 @param heap	Memory heap where allocated
 @param dfield	InnoDB data field to copy to
 @param field	MySQL value for the column
-@param comp	nonzero if in compact format
- */
+@param comp	nonzero if in compact format */
 static __attribute__((nonnull))
 void
 innobase_build_col_map_add(

=== modified file 'storage/innobase/include/dict0dict.h'
--- a/storage/innobase/include/dict0dict.h	revid:[e-mail]-20120618122450-29pn05td5hapd74c
+++ b/storage/innobase/include/dict0dict.h	revid:marko.makela@stripped20618203413-nxmwd82bxjw3zwe8
@@ -1378,8 +1378,9 @@ Determines if a secondary index is being
 or if the table is being rebuilt online, allowing concurrent modifications
 to the table.
 @retval true if the index is being or has been built online, or
-if this is a clustered index and the table is or was being rebuilt online
-@retval false if the index has been created completely */
+if this is a clustered index and the table is being or has been rebuilt online
+@retval false if the index has been created or the table has been
+rebuilt completely */
 UNIV_INLINE
 bool
 dict_index_is_online_ddl(

=== modified file 'storage/innobase/include/dict0dict.ic'
--- a/storage/innobase/include/dict0dict.ic	revid:marko.makela@stripped2450-29pn05td5hapd74c
+++ b/storage/innobase/include/dict0dict.ic	revid:marko.makela@strippedwd82bxjw3zwe8
@@ -1207,8 +1207,9 @@ Determines if a secondary index is being
 or if the table is being rebuilt online, allowing concurrent modifications
 to the table.
 @retval true if the index is being or has been built online, or
-if this is a clustered index and the table is or was being rebuilt online
-@retval false if the index has been created completely */
+if this is a clustered index and the table is being or has been rebuilt online
+@retval false if the index has been created or the table has been
+rebuilt completely */
 UNIV_INLINE
 bool
 dict_index_is_online_ddl(

=== modified file 'storage/innobase/include/mem0mem.ic'
--- a/storage/innobase/include/mem0mem.ic	revid:marko.makela@stripped4c
+++ b/storage/innobase/include/mem0mem.ic	revid:marko.makela@stripped
@@ -251,12 +251,9 @@ mem_heap_free_heap_top(
 	ibool		error;
 	ulint		total_size;
 	ulint		size;
-#endif
 
 	ut_ad(mem_heap_check(heap));
 
-#if defined UNIV_MEM_DEBUG || defined UNIV_DEBUG
-
 	/* Validate the heap and get its total allocated size */
 	mem_heap_validate_or_print(heap, NULL, FALSE, &error, &total_size,
 				   NULL, NULL);

=== modified file 'storage/innobase/include/row0merge.h'
--- a/storage/innobase/include/row0merge.h	revid:[e-mail]-20120618122450-29pn05td5hapd74c
+++ b/storage/innobase/include/row0merge.h	revid:marko.makela@stripped20120618203413-nxmwd82bxjw3zwe8
@@ -123,10 +123,10 @@ typedef struct merge_index_def_struct	me
 struct row_merge_dup_t {
 	dict_index_t*		index;	/*!< index being sorted */
 	struct TABLE*		table;	/*!< MySQL table object */
-	const ulint*		col_map;/*!< mapping of mapping of
-					column numbers in table to the
-					rebuilt table (index->table),
-					or NULL if not rebuilding table */
+	const ulint*		col_map;/*!< mapping of column numbers
+					in table to the rebuilt table
+					(index->table), or NULL if not
+					rebuilding table */
 	ulint			n_dup;	/*!< number of duplicates */
 };
 

No bundle (reason: useless for push emails).