diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-06 09:54:57 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-06 10:59:54 +0300 |
| commit | 30df297c2f398c616d59e807b8005838ab62351b (patch) | |
| tree | 6b64b4f31094cd74984f01e7f873426b107cec65 /storage/xtradb/buf/buf0buf.cc | |
| parent | da61107fc8481b03ae858188dd03b3114e7aa084 (diff) | |
| parent | d8d39721dfef6b965d782e6099493c36150585cf (diff) | |
| download | mariadb-git-30df297c2f398c616d59e807b8005838ab62351b.tar.gz | |
Merge 10.0 into 10.1
Rewrite the test encryption.innodb-checksum-algorithm not to
require any restarts or re-bootstrapping, and to cover all
innodb_page_size combinations.
Test innodb.101_compatibility with all innodb_page_size combinations.
Diffstat (limited to 'storage/xtradb/buf/buf0buf.cc')
| -rw-r--r-- | storage/xtradb/buf/buf0buf.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/storage/xtradb/buf/buf0buf.cc b/storage/xtradb/buf/buf0buf.cc index da4ab059d07..759e1441ee3 100644 --- a/storage/xtradb/buf/buf0buf.cc +++ b/storage/xtradb/buf/buf0buf.cc @@ -3446,17 +3446,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; } |