diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2011-06-09 13:59:02 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2011-06-09 13:59:02 +0300 |
| commit | 34baff7743df3f6fb67c8e4bffa58e9758b0c86b (patch) | |
| tree | 101964bf97b7c8f5be085d3e7ecee1892edcaafd /storage/innobase/trx | |
| parent | 92a017d324c38e9e52586c85bf5a4745b6fab78f (diff) | |
| parent | 6348b7375a506bfe340a390ed6ac832d1e224333 (diff) | |
| download | mariadb-git-34baff7743df3f6fb67c8e4bffa58e9758b0c86b.tar.gz | |
Merge mysql-5.1 to mysql-5.5.
Diffstat (limited to 'storage/innobase/trx')
| -rw-r--r-- | storage/innobase/trx/trx0rec.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/storage/innobase/trx/trx0rec.c b/storage/innobase/trx/trx0rec.c index 5a3b79d0ad5..5f83a9f5fd9 100644 --- a/storage/innobase/trx/trx0rec.c +++ b/storage/innobase/trx/trx0rec.c @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1996, 2010, Innobase Oy. All Rights Reserved. +Copyright (c) 1996, 2011, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -1593,6 +1593,10 @@ trx_undo_prev_version_build( return(DB_ERROR); } +# if defined UNIV_DEBUG || defined UNIV_BLOB_LIGHT_DEBUG + ut_a(!rec_offs_any_null_extern(rec, offsets)); +# endif /* UNIV_DEBUG || UNIV_BLOB_LIGHT_DEBUG */ + if (row_upd_changes_field_size_or_external(index, offsets, update)) { ulint n_ext; |