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

[marko.makela]

 3901 Marko Mäkelä	2012-05-30
      WL#6255 bug fix.
      
      row_tab_op: Use more distinguishable values for the operation codes,
      so that it is easier to inspect the buffered data.
      
      row_log_table_apply_op(): Fix a bug in ROW_T_UPDATE parsing when
      the definition of the PRIMARY KEY is changed.

    modified:
      storage/innobase/row/row0log.cc
 3900 Marko Mäkelä	2012-05-29
      WL#6255: Remove one more bogus assertion on table->n_ref_count.

    modified:
      storage/innobase/handler/handler0alter.cc
=== modified file 'storage/innobase/row/row0log.cc'
--- a/storage/innobase/row/row0log.cc	revid:marko.makela@strippedg2f9fuioa
+++ b/storage/innobase/row/row0log.cc	revid:marko.makela@stripped
@@ -37,7 +37,7 @@ Created 2011-05-26 Marko Makela
 Delete-marked records are not copied to the rebuilt table. */
 enum row_tab_op {
 	/** Insert a record */
-	ROW_T_INSERT,
+	ROW_T_INSERT = 0x41,
 	/** Update a record in place */
 	ROW_T_UPDATE,
 	/** Delete (purge) a record */
@@ -1673,6 +1673,8 @@ row_log_table_apply_op(
 				dfield_set_data(dfield, field, len);
 			}
 
+			mrec = next_mrec;
+
 			/* Fetch the new value of the row as it was
 			in the old table definition. */
 			extra_size = *mrec++;

No bundle (reason: useless for push emails).