diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-29 13:15:36 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-29 13:15:36 +0300 |
| commit | c2ef0bb6cecf034b32fced19d132432b90f3c4d5 (patch) | |
| tree | 249c46d8685de6f97c674e9b14c9929bad526693 /storage | |
| parent | 449a88e1c629b742e8be152c896c65a8bda5c817 (diff) | |
| parent | 2cb94aa1b70fa01d9e5c1d8a7625415a0220a3d9 (diff) | |
| download | mariadb-git-c2ef0bb6cecf034b32fced19d132432b90f3c4d5.tar.gz | |
Merge 5.5 into 10.0
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/buf/buf0buf.cc | 6 | ||||
| -rw-r--r-- | storage/xtradb/buf/buf0buf.cc | 7 |
2 files changed, 0 insertions, 13 deletions
diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc index d045973133e..39cf089c350 100644 --- a/storage/innobase/buf/buf0buf.cc +++ b/storage/innobase/buf/buf0buf.cc @@ -3024,18 +3024,12 @@ got_block: goto loop; } - fprintf(stderr, - "innodb_change_buffering_debug evict %u %u\n", - (unsigned) space, (unsigned) offset); return(NULL); } mutex_enter(&fix_block->mutex); if (buf_flush_page_try(buf_pool, fix_block)) { - fprintf(stderr, - "innodb_change_buffering_debug flush %u %u\n", - (unsigned) space, (unsigned) offset); guess = fix_block; goto loop; } diff --git a/storage/xtradb/buf/buf0buf.cc b/storage/xtradb/buf/buf0buf.cc index c9aa1cf5c13..26b95926e86 100644 --- a/storage/xtradb/buf/buf0buf.cc +++ b/storage/xtradb/buf/buf0buf.cc @@ -3197,17 +3197,10 @@ got_block: goto loop; } - fprintf(stderr, - "innodb_change_buffering_debug evict %u %u\n", - (unsigned) space, (unsigned) offset); return(NULL); } if (buf_flush_page_try(buf_pool, fix_block)) { - fprintf(stderr, - "innodb_change_buffering_debug flush %u %u\n", - (unsigned) space, (unsigned) offset); - guess = fix_block; goto loop; } |