List:Commits« Previous MessageNext Message »
From:marko.makela Date:June 22 2010 12:05pm
Subject:bzr push into mysql-trunk-innodb branch (marko.makela:3112 to 3113) Bug#54686
View as plain text  
 3113 Marko Mäkelä	2010-06-22
      Merge Bug#54686 fix from mysql-5.1-innodb:
      ------------------------------------------------------------
      revno: 3517
      revision-id: marko.makela@strippedx7xuugcxd375
      parent: marko.makela@stripped21095148-8g73k8k68dpj080u
      committer: Marko Mäkelä <marko.makela@stripped>
      branch nick: 5.1-innodb
      timestamp: Tue 2010-06-22 14:52:15 +0300
      message:
        Bug#54686 "field->col->mtype == type" assertion error at row/row0sel.c
        ha_innobase::index_read(), ha_innobase::records_in_range(): Check that
        the index is useable before invoking row_sel_convert_mysql_key_to_innobase().
      
        This fix is based on a suggestion by Yasufumi Kinoshita.

    modified:
      storage/innobase/handler/ha_innodb.cc
 3112 Marko Mäkellush_validate_low():
      Silence GCC warnings about dereferencing a type-punned pointer.
      Approved by Jimmy Yang.

    modified:
      storage/innobase/buf/buf0flu.c
=== modified file 'storage/innobase/handler/ha_innodb.cc'
--- a/storage/innobase/handler/ha_innodb.cc	revid:marko.makela@stripped
+++ b/storage/innobase/handler/ha_innodb.cc	revid:marko.makela@oracle.com-20100622120533-yki7l4uo5kw0fu6e
@@ -5568,6 +5568,9 @@ ha_innobase::index_read(
 		prebuilt->index_usable = FALSE;
 		DBUG_RETURN(HA_ERR_CRASHED);
 	}
+	if (UNIV_UNLIKELY(!prebuilt->index_usable)) {
+		DBUG_RETURN(HA_ERR_TABLE_DEF_CHANGED);
+	}
 
 	/* Note that if the index for which the search template is built is not
 	necessarily prebuilt->index, but can also be the clustered index */
@@ -7410,6 +7413,10 @@ ha_innobase::records_in_range(
 		n_rows = HA_POS_ERROR;
 		goto func_exit;
 	}
+	if (UNIV_UNLIKELY(!row_merge_is_index_usable(prebuilt->trx, index))) {
+		n_rows = HA_ERR_TABLE_DEF_CHANGED;
+		goto func_exit;
+	}
 
 	heap = mem_heap_create(2 * (key->key_parts * sizeof(dfield_t)
 				    + sizeof(dtuple_t)));

Attachment: [text/bzr-bundle] bzr/marko.makela@oracle.com-20100622120533-yki7l4uo5kw0fu6e.bundle
Thread
bzr push into mysql-trunk-innodb branch (marko.makela:3112 to 3113) Bug#54686marko.makela22 Jun