diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2008-12-04 22:17:47 +0100 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2008-12-04 22:17:47 +0100 |
| commit | fb945ef2247f355ae00791aadf0d52a1d68bc01f (patch) | |
| tree | 5c083b7fc66d49fc79b12d7babfe62991a92de87 /storage/innobase/handler | |
| parent | d83f6470243057fdd542bed0410dcabe09766713 (diff) | |
| download | mariadb-git-fb945ef2247f355ae00791aadf0d52a1d68bc01f.tar.gz | |
Fixing Valgrind error: deadlock detector was set to random; seen in many InnoDB tests like innodb-replace.test
storage/innobase/handler/ha_innodb.cc:
Fixing Valgrind error: deadlock detector was set to random. Making the recently added lines closer
to the InnoDB style (tabs not spaces)
Diffstat (limited to 'storage/innobase/handler')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 9c2b71094b6..74e75392668 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -1405,6 +1405,7 @@ innobase_init( int err; bool ret; char *default_path; + my_bool old_safe_mutex_deadlock_detector; DBUG_ENTER("innobase_init"); handlerton *innobase_hton= (handlerton *)p; @@ -1660,13 +1661,13 @@ innobase_init( srv_sizeof_trx_t_in_ha_innodb_cc = sizeof(trx_t); #ifdef SAFE_MUTEX - /* Disable deadlock detection as it's very slow for the buffer pool */ - my_bool old_safe_mutex_deadlock_detector; - safe_mutex_deadlock_detector= 0; + /* Disable deadlock detection as it's very slow for the buffer pool */ + old_safe_mutex_deadlock_detector= safe_mutex_deadlock_detector; + safe_mutex_deadlock_detector= 0; #endif err = innobase_start_or_create_for_mysql(); #ifdef SAFE_MUTEX - safe_mutex_deadlock_detector= old_safe_mutex_deadlock_detector; + safe_mutex_deadlock_detector= old_safe_mutex_deadlock_detector; #endif if (err != DB_SUCCESS) { my_free(internal_innobase_data_file_path, |