Merge branch '10.0' into 10.1

This commit is contained in:
Sergei Golubchik 2015-03-07 13:21:02 +01:00
commit 2db62f686e
728 changed files with 55048 additions and 9876 deletions

View file

@ -5169,11 +5169,6 @@ i_s_innodb_fill_buffer_pool(
info_buffer = (buf_page_info_t*) mem_heap_zalloc(
heap, mem_size);
/* Obtain appropriate mutexes. Since this is diagnostic
buffer pool info printout, we are not required to
preserve the overall consistency, so we can
release mutex periodically */
/* GO through each block in the chunk */
for (n_blocks = num_to_process; n_blocks--; block++) {
i_s_innodb_buffer_page_get_info(