From: Sergey Vojtovich
Date: April 1 2010 11:53am
Subject: bzr commit into mysql-5.1-bugteam branch (svoj:3498)
List-Archive: http://lists.mysql.com/commits/104852
Message-Id: <0L0700MHY521X730@fe-emea-10.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_m7r10rOzGgdR0bZFi0JTvA)"

--Boundary_(ID_m7r10rOzGgdR0bZFi0JTvA)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

#At file:///home/svoj/devel/innodb-snapshots/mysql-5.1-bugteam/ based on revid:svoj@stripped

 3498 Sergey Vojtovich	2010-04-01
      Applying InnoDB snapshot 
      
      Detailed revision comments:
      
      r6675 | marko | 2010-02-11 22:41:11 +0200 (Thu, 11 Feb 2010) | 1 line
      branches/zip: Remove bogus debug assertions introduced in r6660.

    modified:
      storage/innodb_plugin/row/row0umod.c
=== modified file 'storage/innodb_plugin/row/row0umod.c'
--- a/storage/innodb_plugin/row/row0umod.c	2010-04-01 11:52:08 +0000
+++ b/storage/innodb_plugin/row/row0umod.c	2010-04-01 11:53:41 +0000
@@ -323,7 +323,6 @@ row_undo_mod_del_mark_or_remove_sec_low(
 	mtr_t		mtr;
 	mtr_t		mtr_vers;
 
-	ut_ad(node->rec_type == TRX_UNDO_UPD_DEL_REC);
 	log_free_check();
 	mtr_start(&mtr);
 
@@ -421,8 +420,6 @@ row_undo_mod_del_mark_or_remove_sec(
 {
 	ulint	err;
 
-	ut_ad(node->rec_type == TRX_UNDO_UPD_DEL_REC);
-
 	err = row_undo_mod_del_mark_or_remove_sec_low(node, thr, index,
 						      entry, BTR_MODIFY_LEAF);
 	if (err == DB_SUCCESS) {


--Boundary_(ID_m7r10rOzGgdR0bZFi0JTvA)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/svoj@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/svoj@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: svoj@stripped
# target_branch: file:///home/svoj/devel/innodb-snapshots/mysql-5.1-\
#   bugteam/
# testament_sha1: bd5872cf7febac19d281a8a7b5fd73dcd1db240b
# timestamp: 2010-04-01 15:53:51 +0400
# base_revision_id: svoj@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVbSugYAAbjfgEAQUW///3cg
HQC////0UAO5bC8rXdNduzXCSiCm0xDTUz1TGTKeU2kyaMgaDTQBJSTTwmhlATZIZNAAAANACRIm
RGjQNIamhkyaMj1NPUwQaDQ5piYAEwATAACYAAmCSU00BMmTKabRpD1NA0A0AAxL9c9G48MeBx8m
uixGsz26nKW+DkwhFlYnKI/PDVQ2H0k2149xWdPTl4uEp2cTwzxOsSl37f9GzA84n5azxLIuwpLz
cXQ33YeDAorxUG3Y86hjSyNmbchubK8C+dS3QN5tzCi6/yRAQ1bZp8sXHbjT2NouV6RiO5GbBva9
bxyTIEFKc8cIiiQ0lIRufb2wegtJakb1BMtmrVIuuF2QrluV5RzbbcC35MhexGH7XXmusEZBHZGg
qdUcr2/AsMKQXCKG0s+M79UqlTo9orD+ZhYS0GMSNQXjEZOazThS2ioWl1rqNjdip0DkG0zC+auF
ct1pWn5iIqFK1MKbC5aCZYUssYIjMxlpU8V1JO+MujHak6wcRmJSGVMZA27lBPbAZc0DVrLnCIsi
qLSsOBMBzLJcRBdVK1INKSmWtM8feNQpDirTc9NrA8H6VaVJ440VZ1XN9eQgpyK3b6sgsDExw8py
E5GaTVxyvaYz2qVOnIgfAuo2LWwvJiflHmigdsbXWzn8Ds1ypBRxL3JGb7zztM/HCDcrfKNNS9MH
i10vNil1vOEYuOc3qbUd/IX5yuIvCrwhsHQlLqJRacjE1XRa1WbjGOdrNRClfkhpj2NRvWI2GNhg
No59j6G4ByRE0xWxalY8mdBFUpkRNKnYiA3s7TL1C0Dh4hm0HEn4FcY+FT3K1xDhs5sxqVqJL2CP
71ZRjDDnJo1B3yIIlBBPLSyg1tM7xIetVRPoarrHrbBNn5P20HRgZhcig0A1DOTtsirI8UzUWbxP
MC3MFkJwHeHNRv4QZ32zoL0cyCt+/SK1ZAXUb10g7jEnIw5KdOCO6VIpXKoNHhtvJVL1768xs77a
jqkQleaem4oixkdO7lwipCMYTJ2D6lYVaVpSN+ZCmQQtEh3GE6ugU9U7KXhliKOHMX33qtZGlYWn
9fCAy7hdKV2FhLZQ0OQ56CplrGVqVpSlqxJYB3FzqqMaw1StbG54GxzgyGTFBFVny6rTO7g9Eh/x
0ZoITz1rv6JGnqH5IIseMk+BTXkI0gTL6ZDmVsBxemNdheYdynBVxrPetEpa0FEiA5/l1p/pcSqt
q4CjZxtvNhldosVj8OKodHkpbhZphUr/F3JFOFCQVtK6Bg==


--Boundary_(ID_m7r10rOzGgdR0bZFi0JTvA)--