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

[marko.makela]

 3898 Marko Mäkelä	2012-05-29
      WL#6255 bug fix.
      
      ha_innobase::inplace_alter_table(): Remove a bogus debug assertion on
      prebuilt->table->n_ref_count and explain why it became bogus.

    modified:
      storage/innobase/handler/handler0alter.cc
 3897 Marko Mäkelä	2012-05-29
      WL#6255 bug fixes.
      
      row_log_table_apply_update(): Correct assertions and documentation on old_pk.
      
      row_log_table_apply_op(): Parse and initialize old_pk in the same way as in
      row_log_table_update().

    modified:
      storage/innobase/row/row0log.cc
 3896 Marko Mäkelä	2012-05-29
      WL#6255 bug fixes.
      
      prepare_inplace_alter_table_dict(): Pass the same_pk flag correctly to
      row_log_allocate().
      
      ha_innobase::inplace_alter_table(): Relax an assertion on
      table->n_ref_count. A table that is being rebuilt online can be accessed.

    modified:
      storage/innobase/handler/handler0alter.cc
=== modified file 'storage/innobase/handler/handler0alter.cc'
--- a/storage/innobase/handler/handler0alter.cc	revid:marko.makela@strippedx
+++ b/storage/innobase/handler/handler0alter.cc	revid:marko.makela@stripped
@@ -2559,11 +2559,8 @@ oom:
 				prebuilt->table->flags);
 	}
 
-	/* n_ref_count must be 1, or 2 when purge
-	happens to be executing on this very table. */
-	DBUG_ASSERT(ctx->online
-		    || ctx->indexed_table == prebuilt->table
-		    || prebuilt->table->n_ref_count - 1 <= 1);
+	/* prebuilt->table->n_ref_count can be anything here, given
+	that we hold at most a shared lock on the table. */
 	prebuilt->trx->error_info = NULL;
 	ctx->trx->error_state = DB_SUCCESS;
 

=== modified file 'storage/innobase/row/row0log.cc'
--- a/storage/innobase/row/row0log.cc	revid:marko.makela@stripped
+++ b/storage/innobase/row/row0log.cc	revid:[e-mail]-20120529190513-cdow111l50x6kt61
@@ -1218,7 +1218,7 @@ all_done:
 /******************************************************//**
 Replays an update operation on a table that was rebuilt.
 @return DB_SUCCESS or error code */
-static __attribute__((nonnull(1,3,4,5,6,7,8), warn_unused_result))
+static __attribute__((nonnull, warn_unused_result))
 dberr_t
 row_log_table_apply_update(
 /*=======================*/
@@ -1240,7 +1240,7 @@ row_log_table_apply_update(
 	const dtuple_t*		old_pk)		/*!< in: PRIMARY KEY and
 						DB_TRX_ID,DB_ROLL_PTR
 						of the old value,
-						or NULL if same_pk */
+						or PRIMARY KEY if same_pk */
 {
 	const dtuple_t*	row;
 	dict_index_t*	index = dict_table_get_first_index(new_table);
@@ -1250,8 +1250,8 @@ row_log_table_apply_update(
 	ut_ad(dtuple_get_n_fields_cmp(old_pk)
 	      == dict_index_get_n_unique(index));
 	ut_ad(dtuple_get_n_fields(old_pk)
-	      == dict_index_get_n_unique(index) + 1);
-	ut_ad(!!old_pk == dup->index->online_log->same_pk);
+	      == dict_index_get_n_unique(index)
+	      + (dup->index->online_log->same_pk ? 0 : 2));
 
 	row = row_log_table_apply_convert_mrec(
 		mrec, offsets, heap, new_table, altered_table, dup);
@@ -1565,23 +1565,9 @@ row_log_table_apply_op(
 		is not changed, the log will only contain
 		DB_TRX_ID,new_row. */
 
-		old_pk = dtuple_create(heap, new_index->n_uniq + 1);
-
 		if (dup->index->online_log->same_pk) {
 			ut_ad(new_index->n_uniq == dup->index->n_uniq);
 
-			if (DATA_TRX_ID_LEN + 2 + mrec > mrec_end) {
-				return(NULL);
-			}
-
-			/* Set DB_TRX_ID */
-			dfield_set_data(
-				dtuple_get_nth_field(old_pk,
-						     new_index->n_uniq),
-				mrec, DATA_TRX_ID_LEN);
-
-			mrec += DATA_TRX_ID_LEN;
-
 			extra_size = *mrec++;
 
 			if (extra_size >= 0x80) {
@@ -1608,6 +1594,9 @@ row_log_table_apply_op(
 				return(NULL);
 			}
 
+			old_pk = dtuple_create(heap, new_index->n_uniq);
+			dict_table_copy_types(old_pk, new_table);
+
 			/* Copy the PRIMARY KEY fields from mrec to old_pk. */
 			for (ulint i = 0; i < new_index->n_uniq; i++) {
 				const void*	field;
@@ -1632,7 +1621,7 @@ row_log_table_apply_op(
 				return(NULL);
 			}
 
-			rec_offs_set_n_fields(offsets, new_index->n_uniq + 1);
+			rec_offs_set_n_fields(offsets, new_index->n_uniq + 2);
 			rec_init_offsets_comp_ordinary(
 				mrec, 0, new_index, 0, offsets);
 
@@ -1641,9 +1630,14 @@ row_log_table_apply_op(
 				return(NULL);
 			}
 
-			/* Copy the PRIMARY KEY fields and DB_TRX_ID
-			from mrec to old_pk. */
-			for (ulint i = 0; i <= new_index->n_uniq; i++) {
+			/* Copy the PRIMARY KEY fields and
+			DB_TRX_ID, DB_ROLL_PTR from mrec to old_pk. */
+			old_pk = dtuple_create(heap, new_index->n_uniq + 2);
+			dict_table_copy_types(old_pk, new_table);
+
+			for (ulint i = 0;
+			     i < dict_index_get_n_unique(new_index) + 2;
+			     i++) {
 				const void*	field;
 				ulint		len;
 				dfield_t*	dfield;
@@ -1688,6 +1682,7 @@ row_log_table_apply_op(
 		}
 
 		ut_ad(next_mrec <= mrec_end);
+		dtuple_set_n_fields_cmp(old_pk, new_index->n_uniq);
 
 		{
 			ulint		len;

No bundle (reason: useless for push emails).