diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2013-08-14 10:24:36 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2013-08-14 10:24:36 +0300 |
| commit | 60e1a532e5b42a7a3d4da06a76906e8b8e230718 (patch) | |
| tree | 7720134f1e6e823a6a9b0f1af09513459a72f210 /storage/innobase/row | |
| parent | 793b5835fdd104710972f2f2c55bd37989ae5aa8 (diff) | |
| parent | 300ac936be090e12b118dc2f8d334d39cace30ae (diff) | |
| download | mariadb-git-60e1a532e5b42a7a3d4da06a76906e8b8e230718.tar.gz | |
Merge mysql-5.1 to mysql-5.5.
Diffstat (limited to 'storage/innobase/row')
| -rw-r--r-- | storage/innobase/row/row0uins.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/storage/innobase/row/row0uins.c b/storage/innobase/row/row0uins.c index 396cc6b3390..57c8c512698 100644 --- a/storage/innobase/row/row0uins.c +++ b/storage/innobase/row/row0uins.c @@ -340,13 +340,14 @@ row_undo_ins( /* The database must have crashed after inserting a clustered index record but before writing all the externally stored columns of - that record. Because secondary index entries - are inserted after the clustered index record, - we may assume that the secondary index record - does not exist. However, this situation may - only occur during the rollback of incomplete - transactions. */ - ut_a(trx_is_recv(node->trx)); + that record, or a statement is being rolled + back because an error occurred while storing + off-page columns. + + Because secondary index entries are inserted + after the clustered index record, we may + assume that the secondary index record does + not exist. */ } else { log_free_check(); err = row_undo_ins_remove_sec(node->index, entry); |