Commit 80d164c8 authored by guilhem@mysql.com's avatar guilhem@mysql.com

Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/home/mysql_src/mysql-4.1-clean
parents 613c98ce 13a60a76
...@@ -2866,6 +2866,8 @@ ibuf_delete_rec( ...@@ -2866,6 +2866,8 @@ ibuf_delete_rec(
#ifdef UNIV_IBUF_DEBUG #ifdef UNIV_IBUF_DEBUG
ibuf_count_set(space, page_no, ibuf_count_get(space, page_no) - 1); ibuf_count_set(space, page_no, ibuf_count_get(space, page_no) - 1);
#else
UT_NOT_USED(space);
#endif #endif
ibuf_data_sizes_update(ibuf_data, root, mtr); ibuf_data_sizes_update(ibuf_data, root, mtr);
...@@ -3267,11 +3269,11 @@ ibuf_delete_for_discarded_space( ...@@ -3267,11 +3269,11 @@ ibuf_delete_for_discarded_space(
ibuf_data->n_merged_recs += n_inserts; ibuf_data->n_merged_recs += n_inserts;
mutex_exit(&ibuf_mutex); mutex_exit(&ibuf_mutex);
/*
fprintf(stderr, fprintf(stderr,
"InnoDB: Discarded %lu ibuf entries for space %lu\n", "InnoDB: Discarded %lu ibuf entries for space %lu\n",
(ulong) n_inserts, (ulong) space); (ulong) n_inserts, (ulong) space);
*/
ibuf_exit(); ibuf_exit();
mem_heap_free(heap); mem_heap_free(heap);
......
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