← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/buf/buf0flu.c

  • Committer: Brian Aker
  • Date: 2010-12-08 22:35:56 UTC
  • mfrom: (1819.9.158 update-innobase)
  • Revision ID: brian@tangent.org-20101208223556-37mi4omqg7lkjzf3
Merge in Stewart's changes, 1.3 changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/buf/buf0flu.c
131
131
/*============================*/
132
132
        buf_page_t*     bpage)  /*!< in: bpage to be removed. */
133
133
{
 
134
#ifdef UNIV_DEBUG
134
135
        ibool           ret = FALSE;
 
136
#endif /* UNIV_DEBUG */
135
137
        buf_pool_t*     buf_pool = buf_pool_from_bpage(bpage);
136
138
 
137
139
        ut_ad(buf_flush_list_mutex_own(buf_pool));
138
140
 
139
 
        ret = rbt_delete(buf_pool->flush_rbt, &bpage);
 
141
#ifdef UNIV_DEBUG
 
142
        ret =
 
143
#endif /* UNIV_DEBUG */
 
144
        rbt_delete(buf_pool->flush_rbt, &bpage);
140
145
        ut_ad(ret);
141
146
}
142
147