Commit 44e4ead2 authored by Marko Mäkelä's avatar Marko Mäkelä

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.
parent fd7a1118
...@@ -3619,11 +3619,8 @@ row_search_for_mysql( ...@@ -3619,11 +3619,8 @@ row_search_for_mysql(
ut_a(trx->isolation_level ut_a(trx->isolation_level
== TRX_ISO_READ_UNCOMMITTED); == TRX_ISO_READ_UNCOMMITTED);
err = DB_TOO_BIG_RECORD; /* Proceed as in case SEL_RETRY. */
break;
/* We let the main loop to do the
error handling */
goto shortcut_fails_too_big_rec;
} }
mtr_commit(&mtr); mtr_commit(&mtr);
...@@ -3663,7 +3660,7 @@ row_search_for_mysql( ...@@ -3663,7 +3660,7 @@ row_search_for_mysql(
default: default:
ut_ad(0); ut_ad(0);
} }
shortcut_fails_too_big_rec:
mtr_commit(&mtr); mtr_commit(&mtr);
mtr_start(&mtr); mtr_start(&mtr);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment