diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2010-06-30 12:38:47 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2010-06-30 12:38:47 +0300 |
| commit | 38d8ca8cec7c8e38c41bd8f17b1caa8f5142827c (patch) | |
| tree | 7b5974c7b9a66f1277fe17bc198a21c61415959c /storage | |
| parent | 707a3bef6e95b1125c91d3a5ecc821bba20caa26 (diff) | |
| download | mariadb-git-38d8ca8cec7c8e38c41bd8f17b1caa8f5142827c.tar.gz | |
Bug#54358 follow-up: Correct some error handling.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innodb_plugin/row/row0sel.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/storage/innodb_plugin/row/row0sel.c b/storage/innodb_plugin/row/row0sel.c index d0c59862fce..76c144e5a8c 100644 --- a/storage/innodb_plugin/row/row0sel.c +++ b/storage/innodb_plugin/row/row0sel.c @@ -3627,11 +3627,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); @@ -3671,7 +3668,7 @@ release_search_latch_if_needed: default: ut_ad(0); } -shortcut_fails_too_big_rec: + mtr_commit(&mtr); mtr_start(&mtr); } |