diff options
| author | unknown <monty@mashka.mysql.fi> | 2004-02-20 17:43:02 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2004-02-20 17:43:02 +0200 |
| commit | 8b2b219fb5e1374abdd816d9d0911d37087c86a5 (patch) | |
| tree | e13a23a1c9f28ed5eb2d903ba59a153cda3355ac /innobase/sync/sync0sync.c | |
| parent | 51a6b4f47ad03031105b0f8ac810d522a804695e (diff) | |
| parent | 9bc5cdba41a0d2bc3c391469b14168f82e636a6b (diff) | |
| download | mariadb-git-8b2b219fb5e1374abdd816d9d0911d37087c86a5.tar.gz | |
merge with 4.0 to get security fixes and latest bug fixes
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
Auto merged
VC++Files/mysql.dsw:
Auto merged
VC++Files/mysys/mysys.dsp:
Auto merged
innobase/buf/buf0buf.c:
Auto merged
innobase/include/srv0start.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/mem/mem0dbg.c:
Auto merged
innobase/que/que0que.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/sync/sync0rw.c:
Auto merged
innobase/sync/sync0sync.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
libmysql/manager.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/unireg.cc:
Auto merged
VC++Files/sql/mysqld.dsp:
Removed wrong define USE_SYMLINK
include/config-win.h:
Use original code
innobase/srv/srv0srv.c:
merge
innobase/usr/usr0sess.c:
merge
libmysql/libmysql.c:
merge
mysql-test/r/func_test.result:
merge
mysql-test/t/func_test.test:
merge
sql/log.cc:
merge
sql/mysqld.cc:
merge
Diffstat (limited to 'innobase/sync/sync0sync.c')
| -rw-r--r-- | innobase/sync/sync0sync.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/innobase/sync/sync0sync.c b/innobase/sync/sync0sync.c index eb13c59baf4..d5a6fff47bf 100644 --- a/innobase/sync/sync0sync.c +++ b/innobase/sync/sync0sync.c @@ -314,9 +314,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; @@ -415,9 +415,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; @@ -462,9 +462,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; @@ -685,18 +685,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 } /********************************************************************** |