diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-05-18 15:45:55 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-05-18 15:45:55 +0300 |
| commit | 45898c20928ae71f2c28dca48e66c661b9545347 (patch) | |
| tree | 4b12470d4ee5dc1845d6e5680f5a67ac210195a6 /storage/xtradb/buf | |
| parent | 0e3ca225ad65f14da79c9a73aeadcc2a3e1c0c2a (diff) | |
| parent | 648d86615043e76633ac536b1000ba86abbc8af1 (diff) | |
| download | mariadb-git-45898c20928ae71f2c28dca48e66c661b9545347.tar.gz | |
Merge remote-tracking branch 'origin/10.0' into 10.0
Diffstat (limited to 'storage/xtradb/buf')
| -rw-r--r-- | storage/xtradb/buf/buf0buf.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/xtradb/buf/buf0buf.cc b/storage/xtradb/buf/buf0buf.cc index 0f989553440..c9aa1cf5c13 100644 --- a/storage/xtradb/buf/buf0buf.cc +++ b/storage/xtradb/buf/buf0buf.cc @@ -2,6 +2,7 @@ Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2008, Google Inc. +Copyright (c) 2017, MariaDB Corporation. Portions of this file contain modifications contributed and copyrighted by Google, Inc. Those modifications are gratefully acknowledged and are described @@ -1432,8 +1433,6 @@ buf_pool_init_instance( buf_pool->chunks = chunk = (buf_chunk_t*) mem_zalloc(sizeof *chunk); - UT_LIST_INIT(buf_pool->free); - if (!buf_chunk_init(buf_pool, chunk, buf_pool_size)) { mem_free(chunk); mem_free(buf_pool); |