bzr push into mysql-trunk-wl6255 branch (marko.makela:3976 to 3977) WL#5526

[marko.makela]

 3977 Marko Mäkelä	2012-06-13
      WL#5526 rb:1105 Problem 24 fix.
      
      innobase_rec_to_mysql(): If col_map[] maps a column outside 0..n_fields-1,
      skip the column.

    modified:
      storage/innobase/handler/handler0alter.cc
 3976 Marko Mäkelä	2012-06-13
      row_log_table_delete(): Check errors from row_log_table_get_pk().

    modified:
      storage/innobase/row/row0log.cc
=== modified file 'storage/innobase/handler/handler0alter.cc'
--- a/storage/innobase/handler/handler0alter.cc	revid:marko.makela@strippedd5
+++ b/storage/innobase/handler/handler0alter.cc	revid:marko.makela@stripped
@@ -1059,7 +1059,11 @@ innobase_rec_to_mysql(
 		if (col_map) {
 			col_no = col_map[i];
 
-			if (col_no == ULINT_UNDEFINED) {
+			if (col_no >= n_fields) {
+				/* If col_no != ULINT_UNDEFINED, this
+				should be a hidden FTS_DOC_ID column.
+				Either way, it does not exist in the
+				MySQL view of the table. */
 				goto null_field;
 			}
 		} else {

No bundle (reason: useless for push emails).