diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-08-11 23:55:41 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-08-11 23:55:41 -0400 |
| commit | 8358dd53b7406deaa9f50ad09b16a86b7e367632 (patch) | |
| tree | ef8995ad0e400cb6a1842649c3c886c7b3474835 /storage/innobase/dict/dict0mem.cc | |
| parent | e06e12f5b8dfe0ab2e5976eec1b27b25d318441b (diff) | |
| parent | 4105cbf4a230c82ea7dee31d4d2262b798fad9f4 (diff) | |
| download | mariadb-git-8358dd53b7406deaa9f50ad09b16a86b7e367632.tar.gz | |
bzr merge -r4346 maria/10.0 (maria-10.0.13)
Diffstat (limited to 'storage/innobase/dict/dict0mem.cc')
| -rw-r--r-- | storage/innobase/dict/dict0mem.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/storage/innobase/dict/dict0mem.cc b/storage/innobase/dict/dict0mem.cc index 60daeea3a96..6310b2fd225 100644 --- a/storage/innobase/dict/dict0mem.cc +++ b/storage/innobase/dict/dict0mem.cc @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1996, 2014, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2012, Facebook Inc. This program is free software; you can redistribute it and/or modify it under @@ -95,9 +95,9 @@ dict_mem_table_create( ut_d(table->magic_n = DICT_TABLE_MAGIC_N); - table->stats_latch = new rw_lock_t; - rw_lock_create(dict_table_stats_latch_key, table->stats_latch, - SYNC_INDEX_TREE); + /* true means that the stats latch will be enabled - + dict_table_stats_lock() will not be noop. */ + dict_table_stats_latch_create(table, true); #ifndef UNIV_HOTBACKUP table->autoinc_lock = static_cast<ib_lock_t*>( @@ -154,8 +154,7 @@ dict_mem_table_free( mutex_free(&(table->autoinc_mutex)); #endif /* UNIV_HOTBACKUP */ - rw_lock_free(table->stats_latch); - delete table->stats_latch; + dict_table_stats_latch_destroy(table); ut_free(table->name); mem_heap_free(table->heap); |