diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2011-06-15 10:30:19 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2011-06-15 10:30:19 +0300 |
| commit | d5d2c4fa741f57ff40dbf886ef613626a2638ed9 (patch) | |
| tree | ba38c28b49fc6789d1983f1aa9c7646926470b0f /storage/innobase/include/rem0rec.h | |
| parent | 7eddf251bae7d8d0497c7221a8b646da5321732e (diff) | |
| parent | a8629376994c1365923ac9144354d7cd99d8288a (diff) | |
| download | mariadb-git-d5d2c4fa741f57ff40dbf886ef613626a2638ed9.tar.gz | |
Merge mysql-5.1 to mysql-5.5.
Diffstat (limited to 'storage/innobase/include/rem0rec.h')
| -rw-r--r-- | storage/innobase/include/rem0rec.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/include/rem0rec.h b/storage/innobase/include/rem0rec.h index 46914d13c7f..10b74d18c13 100644 --- a/storage/innobase/include/rem0rec.h +++ b/storage/innobase/include/rem0rec.h @@ -480,7 +480,7 @@ ulint rec_offs_any_extern( /*================*/ const ulint* offsets);/*!< in: array returned by rec_get_offsets() */ -#if defined UNIV_DEBUG || defined UNIV_BLOB_LIGHT_DEBUG +#ifdef UNIV_BLOB_NULL_DEBUG /******************************************************//** Determine if the offsets are for a record containing null BLOB pointers. @return first field containing a null BLOB pointer, or NULL if none found */ @@ -491,7 +491,7 @@ rec_offs_any_null_extern( const rec_t* rec, /*!< in: record */ const ulint* offsets) /*!< in: rec_get_offsets(rec) */ __attribute__((nonnull, warn_unused_result)); -#endif /* UNIV_DEBUG || UNIV_BLOB_LIGHT_DEBUG */ +#endif /* UNIV_BLOB_NULL_DEBUG */ /******************************************************//** Returns nonzero if the extern bit is set in nth field of rec. @return nonzero if externally stored */ |