Commit c3d3562e authored by Michael Widenius's avatar Michael Widenius

automatic merge with 5.1-release

parents bbb951cc a9752b8c
...@@ -1046,7 +1046,6 @@ static inline void dec_counter_for_resize_op(PAGECACHE *pagecache) ...@@ -1046,7 +1046,6 @@ static inline void dec_counter_for_resize_op(PAGECACHE *pagecache)
("thread %ld", last_thread->next->id)); ("thread %ld", last_thread->next->id));
pagecache_pthread_cond_signal(&last_thread->next->suspend); pagecache_pthread_cond_signal(&last_thread->next->suspend);
} }
DBUG_ASSERT((longlong) pagecache->cnt_for_resize_op >= 0);
#else #else
pagecache->cnt_for_resize_op--; pagecache->cnt_for_resize_op--;
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment