diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2011-06-16 11:51:04 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2011-06-16 11:51:04 +0300 |
| commit | 417a267927b9249868e8ca7bd3cb7b6e09485f43 (patch) | |
| tree | f99692de59c54f1b656333262ecce27284894cf8 /storage/innobase/include/rem0rec.ic | |
| parent | 5b4ceba58d1c9c35e0cba1f126290009bd7643ae (diff) | |
| download | mariadb-git-417a267927b9249868e8ca7bd3cb7b6e09485f43.tar.gz | |
Re-enable the debug assertions for Bug#12650861.
Replace UNIV_BLOB_NULL_DEBUG with UNIV_DEBUG||UNIV_BLOB_LIGHT_DEBUG.
Fix known bogus failures.
btr_cur_optimistic_update(): If rec_offs_any_null_extern(), assert that
the current transaction is an incomplete transaction that is being
rolled back in crash recovery.
row_build(): If rec_offs_any_null_extern(), assert that the transaction
that last updated the record was recovered during crash recovery
(and will soon be rolled back).
Diffstat (limited to 'storage/innobase/include/rem0rec.ic')
| -rw-r--r-- | storage/innobase/include/rem0rec.ic | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/include/rem0rec.ic b/storage/innobase/include/rem0rec.ic index 9e659f12881..566c62e30f2 100644 --- a/storage/innobase/include/rem0rec.ic +++ b/storage/innobase/include/rem0rec.ic @@ -1021,7 +1021,7 @@ rec_offs_any_extern( return(FALSE); } -#ifdef UNIV_BLOB_NULL_DEBUG +#if defined UNIV_DEBUG || defined UNIV_BLOB_LIGHT_DEBUG /******************************************************** Determine if the offsets are for a record containing null BLOB pointers. */ UNIV_INLINE @@ -1055,7 +1055,7 @@ rec_offs_any_null_extern( return(NULL); } -#endif /* UNIV_BLOB_NULL_DEBUG */ +#endif /* UNIV_DEBUG || UNIV_BLOB_LIGHT_DEBUG */ /*************************************************************** Sets the value of the ith field extern storage bit. */ |