diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-06-16 12:46:14 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-06-16 12:46:14 +0200 |
| commit | 9859d366b5dede25308b562c24316c44a6474275 (patch) | |
| tree | 0b39ae57f5bf3f4f69c070d65d0db6e7b14c407c /storage/xtradb/page | |
| parent | a65162a396b1c298687992dd62ece924978b4c29 (diff) | |
| parent | 90849456d794aa6df32554a588da5db8cb15f5aa (diff) | |
| download | mariadb-git-9859d366b5dede25308b562c24316c44a6474275.tar.gz | |
Merge branch 'merge-xtradb-5.6' into 10.0
Diffstat (limited to 'storage/xtradb/page')
| -rw-r--r-- | storage/xtradb/page/page0zip.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/xtradb/page/page0zip.cc b/storage/xtradb/page/page0zip.cc index 535497480b7..d3ac5b261a4 100644 --- a/storage/xtradb/page/page0zip.cc +++ b/storage/xtradb/page/page0zip.cc @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 2005, 2014, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2005, 2015, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2012, Facebook Inc. Copyright (c) 2014, SkySQL Ab. All Rights Reserved. @@ -1601,7 +1601,7 @@ page_zip_fields_free( { if (index) { dict_table_t* table = index->table; - os_fast_mutex_free(&index->zip_pad.mutex); + dict_index_zip_pad_mutex_destroy(index); mem_heap_free(index->heap); dict_mem_table_free(table); @@ -1652,7 +1652,7 @@ page_zip_fields_decode( } table = dict_mem_table_create("ZIP_DUMMY", DICT_HDR_SPACE, n, - DICT_TF_COMPACT, 0, true); + DICT_TF_COMPACT, 0); index = dict_mem_index_create("ZIP_DUMMY", "ZIP_DUMMY", DICT_HDR_SPACE, 0, n); index->table = table; |