From b8dfa772ee950f44eaacf5bbeebe66283958ec21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@oracle.com> Date: Wed, 30 Jun 2010 12:55:10 +0300 Subject: [PATCH] =?UTF-8?q?Merge=20a=20Bug=20#54358=20error=20handling=20c?= =?UTF-8?q?orrection=20from=20mysql-5.1-innodb:=20------------------------?= =?UTF-8?q?------------------------------------=20revno:=203534=20revision?= =?UTF-8?q?-id:=20marko.makela@oracle.com-20100630093847-7gkr1lh3bh2xksy0?= =?UTF-8?q?=20parent:=20marko.makela@oracle.com-20100630093149-wmc37t128gi?= =?UTF-8?q?c933v=20committer:=20Marko=20M=C3=A4kel=C3=A4=20<marko.makela@o?= =?UTF-8?q?racle.com>=20branch=20nick:=205.1-innodb=20timestamp:=20Wed=202?= =?UTF-8?q?010-06-30=2012:38:47=20+0300=20message:=20=20=20Bug#54358=20fol?= =?UTF-8?q?low-up:=20Correct=20some=20error=20handling.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- storage/innobase/row/row0sel.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/storage/innobase/row/row0sel.c b/storage/innobase/row/row0sel.c index 3d43596594..39ab217974 100644 --- a/storage/innobase/row/row0sel.c +++ b/storage/innobase/row/row0sel.c @@ -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); } -- 2.30.9