diff options
author | Vasil Dimov <vasil.dimov@oracle.com> | 2010-04-19 20:53:16 +0300 |
---|---|---|
committer | Vasil Dimov <vasil.dimov@oracle.com> | 2010-04-19 20:53:16 +0300 |
commit | c7525a01306e49897c52ea7e9844697f8f8379a1 (patch) | |
tree | 0c1af6979d3c01e38c801d71a2fc74150cc30667 /storage/innobase/ha | |
parent | 49dc3a7b325135c8cd2f93c213a48497d1b57dae (diff) | |
parent | ed30b504d2fd9c14af243248f5a94ae5488ad026 (diff) | |
download | mariadb-git-c7525a01306e49897c52ea7e9844697f8f8379a1.tar.gz |
Merge from innodb-branches-innodb+ (2)
Diffstat (limited to 'storage/innobase/ha')
-rw-r--r-- | storage/innobase/ha/ha0ha.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/ha/ha0ha.c b/storage/innobase/ha/ha0ha.c index db85288298d..9d9d341ad39 100644 --- a/storage/innobase/ha/ha0ha.c +++ b/storage/innobase/ha/ha0ha.c @@ -403,8 +403,6 @@ ha_print_info( FILE* file, /*!< in: file where to print */ hash_table_t* table) /*!< in: hash table */ { - ut_ad(table); - ut_ad(table->magic_n == HASH_TABLE_MAGIC_N); #ifdef UNIV_DEBUG /* Some of the code here is disabled for performance reasons in production builds, see http://bugs.mysql.com/36941 */ @@ -418,6 +416,8 @@ builds, see http://bugs.mysql.com/36941 */ #endif /* PRINT_USED_CELLS */ ulint n_bufs; + ut_ad(table); + ut_ad(table->magic_n == HASH_TABLE_MAGIC_N); #ifdef PRINT_USED_CELLS for (i = 0; i < hash_get_n_cells(table); i++) { |