mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge a Bug #54358 error handling correction from mysql-5.1-innodb:

Browse source 
------------------------------------------------------------
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.
This commit is contained in:
Marko Mäkelä 2010-06-30 12:55:10 +03:00
parent fd7a1118cf
commit 44e4ead2d0
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
storage/innobase/row/row0sel.c
View file

@ -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);
}