diff options
| author | marko@hundin.mysql.fi <> | 2004-02-19 11:40:36 +0200 |
|---|---|---|
| committer | marko@hundin.mysql.fi <> | 2004-02-19 11:40:36 +0200 |
| commit | 38b46781ed80121e250c59c77ed76eb8aa88a12a (patch) | |
| tree | cc368ef59bb3f26a34ffc9cb5d37f2f3146ef2cd /innobase/sync | |
| parent | 42b18e6fabb6a983bc758b0b6a4dc79bc06cfffd (diff) | |
| download | mariadb-git-38b46781ed80121e250c59c77ed76eb8aa88a12a.tar.gz | |
Many files:
Remove leading whitespace from lines containing preprocessor directives
Makefile.am:
Remove univold.i and univoldmysql.i
Diffstat (limited to 'innobase/sync')
| -rw-r--r-- | innobase/sync/sync0rw.c | 16 | ||||
| -rw-r--r-- | innobase/sync/sync0sync.c | 18 |
2 files changed, 17 insertions, 17 deletions
diff --git a/innobase/sync/sync0rw.c b/innobase/sync/sync0rw.c index b214bca0470..fd52d5aac2e 100644 --- a/innobase/sync/sync0rw.c +++ b/innobase/sync/sync0rw.c @@ -318,10 +318,10 @@ rw_lock_x_lock_low( lock->writer_count++; lock->pass = pass; - #ifdef UNIV_SYNC_DEBUG +#ifdef UNIV_SYNC_DEBUG rw_lock_add_debug_info(lock, pass, RW_LOCK_EX, file_name, line); - #endif +#endif lock->last_x_file_name = file_name; lock->last_x_line = line; @@ -334,10 +334,10 @@ rw_lock_x_lock_low( lock->pass = pass; lock->writer_is_wait_ex = TRUE; - #ifdef UNIV_SYNC_DEBUG +#ifdef UNIV_SYNC_DEBUG rw_lock_add_debug_info(lock, pass, RW_LOCK_WAIT_EX, file_name, line); - #endif +#endif return(RW_LOCK_WAIT_EX); } @@ -353,11 +353,11 @@ rw_lock_x_lock_low( lock->pass = pass; lock->writer_is_wait_ex = FALSE; - #ifdef UNIV_SYNC_DEBUG +#ifdef UNIV_SYNC_DEBUG rw_lock_remove_debug_info(lock, pass, RW_LOCK_WAIT_EX); rw_lock_add_debug_info(lock, pass, RW_LOCK_EX, file_name, line); - #endif +#endif lock->last_x_file_name = file_name; lock->last_x_line = line; @@ -376,10 +376,10 @@ rw_lock_x_lock_low( lock->writer_count++; - #ifdef UNIV_SYNC_DEBUG +#ifdef UNIV_SYNC_DEBUG rw_lock_add_debug_info(lock, pass, RW_LOCK_EX, file_name, line); - #endif +#endif lock->last_x_file_name = file_name; lock->last_x_line = line; diff --git a/innobase/sync/sync0sync.c b/innobase/sync/sync0sync.c index 32615ce88ac..7b387946d82 100644 --- a/innobase/sync/sync0sync.c +++ b/innobase/sync/sync0sync.c @@ -301,9 +301,9 @@ mutex_enter_nowait( if (!mutex_test_and_set(mutex)) { - #ifdef UNIV_SYNC_DEBUG +#ifdef UNIV_SYNC_DEBUG mutex_set_debug_info(mutex, file_name, line); - #endif +#endif mutex->file_name = file_name; mutex->line = line; @@ -402,9 +402,9 @@ spin_loop: if (mutex_test_and_set(mutex) == 0) { /* Succeeded! */ - #ifdef UNIV_SYNC_DEBUG +#ifdef UNIV_SYNC_DEBUG mutex_set_debug_info(mutex, file_name, line); - #endif +#endif mutex->file_name = file_name; mutex->line = line; @@ -449,9 +449,9 @@ spin_loop: sync_array_free_cell(sync_primary_wait_array, index); - #ifdef UNIV_SYNC_DEBUG +#ifdef UNIV_SYNC_DEBUG mutex_set_debug_info(mutex, file_name, line); - #endif +#endif mutex->file_name = file_name; mutex->line = line; @@ -671,18 +671,18 @@ ibool sync_all_freed(void) /*================*/ { - #ifdef UNIV_SYNC_DEBUG +#ifdef UNIV_SYNC_DEBUG if (mutex_n_reserved() + rw_lock_n_locked() == 0) { return(TRUE); } else { return(FALSE); } - #else +#else ut_error; return(FALSE); - #endif +#endif } /********************************************************************** |