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

[marko.makela]

 3987 Marko Mäkelä	2012-06-18
      WL#6255 rb:1105 Problem 28 fix.
      
      innobase_build_col_map(): Do not overwrite the FTS_DOC_ID mapping.

    modified:
      storage/innobase/handler/handler0alter.cc
 3986 Marko Mäkelä	2012-06-15
      WL#6255: Avoid possible memory corruption.
      
      Ignore auto_increment_offset when adding an AUTO_INCREMENT column.
      
      innobase_build_col_map(): Do not write to altered_table->s->field[].
      This means that we will use the default value of the column as the
      initial value for the AUTO_INCREMENT counter.

    modified:
      mysql-test/suite/innodb/r/innodb-alter-autoinc.result
      mysql-test/suite/innodb/t/innodb-alter-autoinc.test
      storage/innobase/handler/handler0alter.cc
=== modified file 'storage/innobase/handler/handler0alter.cc'
--- a/storage/innobase/handler/handler0alter.cc	revid:marko.makela@stripped3719-v0rrzq92doxvz5dt
+++ b/storage/innobase/handler/handler0alter.cc	revid:marko.makela@stripped-29pn05td5hapd74c
@@ -2267,6 +2267,8 @@ found_col:
 					    DICT_TF2_FTS_HAS_DOC_ID));
 			col_map[i] = ULINT_UNDEFINED;
 		}
+
+		i++;
 	} else {
 		DBUG_ASSERT(!DICT_TF2_FLAG_IS_SET(
 				    old_table,

No bundle (reason: useless for push emails).