diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2010-06-30 12:55:10 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2010-06-30 12:55:10 +0300 |
| commit | 75a5aaf2ada1ae4b7a06e3742f5762aa0f330420 (patch) | |
| tree | d951c62236d3151426a8fd127a9d27d561931141 /storage | |
| parent | 533d430d2ce4c749e4671665d540cf0302afda6b (diff) | |
| download | mariadb-git-75a5aaf2ada1ae4b7a06e3742f5762aa0f330420.tar.gz | |
Merge a Bug #54358 error handling correction from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3534
revision-id: marko.makela@oracle.com-20100630093847-7gkr1lh3bh2xksy0
parent: marko.makela@oracle.com-20100630093149-wmc37t128gic933v
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Wed 2010-06-30 12:38:47 +0300
message:
Bug#54358 follow-up: Correct some error handling.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/row/row0sel.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/storage/innobase/row/row0sel.c b/storage/innobase/row/row0sel.c index 3d435965949..39ab2179740 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); } |