bzr commit into mysql-trunk-innodb branch (marko.makela:3131) Bug#54358

[marko.makela]

#At file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ based on revid:marko.makela@strippedgukdy2g6k7x4

 3131 Marko Mäkelä	2010-06-30
      Merge a Bug #54358 error handling correction from mysql-5.1-innodb:
      ------------------------------------------------------------
      revno: 3534
      revision-id: marko.makela@stripped
      parent: marko.makela@strippedgic933v
      committer: Marko Mäkelä <[e-mail]>
      branch nick: 5.1-innodb
      timestamp: Wed 2010-06-30 12:38:47 +0300
      message:
        Bug#54358 follow-up: Correct some error handling.

    modified:
      storage/innobase/row/row0sel.c
=== modified file 'storage/innobase/row/row0sel.c'
--- a/storage/innobase/row/row0sel.c	revid:marko.makela@stripped1-bietgukdy2g6k7x4
+++ b/storage/innobase/row/row0sel.c	revid:marko.makela@strippedav5
@@ -3619,11 +3619,8 @@ row_search_for_mysql(
 					ut_a(trx->isolation_level
 					     == TRX_ISO_READ_UNCOMMITTED);
 
-					err = DB_TOO_BIG_RECORD;
-
-					/* We let the main loop to do the
-					error handling */
-					goto shortcut_fails_too_big_rec;
+					/* Proceed as in case SEL_RETRY. */
+					break;
 				}
 
 				mtr_commit(&mtr);
@@ -3663,7 +3660,7 @@ release_search_latch_if_needed:
 			default:
 				ut_ad(0);
 			}
-shortcut_fails_too_big_rec:
+
 			mtr_commit(&mtr);
 			mtr_start(&mtr);
 		}

Attachment: [text/bzr-bundle] bzr/[e-mail]