~drizzle-trunk/drizzle/development

Viewing all changes in revision 1819.9.28.

  • Committer: Stewart Smith
  • Author(s): Marko Mäkelä
  • Date: 2010-11-17 05:25:39 UTC
  • mto: (2021.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 1971.
  • Revision ID: stewart@flamingspork.com-20101117052539-n2s85juhdowxsy45
Merge Revision revid:marko.makela@oracle.com-20100622120533-yki7l4uo5kw0fu6e from MySQL InnoDB

Original revid:marko.makela@oracle.com-20100622120533-yki7l4uo5kw0fu6e

Original Authors: Marko Mäkelä <marko.makela@oracle.com>
Original commit message:
Merge Bug#54686 fix from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3517
revision-id: marko.makela@oracle.com-20100622115215-kxtzx7xuugcxd375
parent: marko.makela@oracle.com-20100621095148-8g73k8k68dpj080u
committer: Marko Mäkelä <marko.makela@oracle.com>
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.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: