Merge remote-tracking branch 'origin/mdb.master'

This commit is contained in:
Howard Chu 2012-10-30 16:34:14 -07:00
commit 64b164b4fc

View File

@ -297,6 +297,7 @@ static txnid_t mdb_debug_start;
fprintf(stderr, "%s:%d " fmt "\n", __func__, __LINE__, __VA_ARGS__))) fprintf(stderr, "%s:%d " fmt "\n", __func__, __LINE__, __VA_ARGS__)))
#else #else
# define DPRINTF(fmt, ...) ((void) 0) # define DPRINTF(fmt, ...) ((void) 0)
# define MDB_DEBUG_SKIP
#endif #endif
/** Print a debug string. /** Print a debug string.
* The string is printed literally, with no format processing. * The string is printed literally, with no format processing.
@ -3683,7 +3684,7 @@ static void
mdb_cursor_pop(MDB_cursor *mc) mdb_cursor_pop(MDB_cursor *mc)
{ {
if (mc->mc_snum) { if (mc->mc_snum) {
#if MDB_DEBUG #ifndef MDB_DEBUG_SKIP
MDB_page *top = mc->mc_pg[mc->mc_top]; MDB_page *top = mc->mc_pg[mc->mc_top];
#endif #endif
mc->mc_snum--; mc->mc_snum--;