diff options
| author | unknown <monty@mishka.local> | 2004-04-27 15:33:40 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2004-04-27 15:33:40 +0300 |
| commit | a3828081cde644ab551c21a621b8e6ab69923e6a (patch) | |
| tree | 4b29146428c84ab3e10e4007d26e3c0b4b2b1074 /innobase/sync | |
| parent | 1065f2bbd66ac4b1161f5c188171a54cbad5b422 (diff) | |
| download | mariadb-git-a3828081cde644ab551c21a621b8e6ab69923e6a.tar.gz | |
After merge fixes
Changed 'SHOW FIELD STATUS' to use 'Engine' instead of 'Type'
client/client_priv.h:
Added option 'create_options' for mysqldump
client/mysqldump.c:
Changed '--all' to '--create-options' as the old name was meaningless
innobase/buf/buf0buf.c:
After merge fixes
innobase/buf/buf0lru.c:
After merge fixes
innobase/buf/buf0rea.c:
After merge fixes
innobase/dict/dict0load.c:
After merge fixes
innobase/fil/fil0fil.c:
After merge fixes
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/include/fil0fil.h:
After merge fixes
innobase/include/row0mysql.h:
After merge fixes
innobase/include/ut0mem.h:
After merge fixes
innobase/log/log0recv.c:
After merge fixes
innobase/row/row0mysql.c:
After merge fixes
innobase/row/row0sel.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
innobase/sync/sync0rw.c:
After merge fixes
innobase/sync/sync0sync.c:
After merge fixes
myisam/ft_boolean_search.c:
After merge fixes
myisam/ft_nlq_search.c:
After merge fixes
mysql-test/r/mysqldump.result:
After merge fixes
mysql-test/t/mysqldump.test:
Make result file smaller
Some new tests
sql/ha_innodb.cc:
After merge fixes
sql/set_var.cc:
Removed compiler warning
sql/slave.cc:
After merge fixes
sql/slave.h:
After merge fixes
sql/sql_show.cc:
Type -> Engine
Diffstat (limited to 'innobase/sync')
| -rw-r--r-- | innobase/sync/sync0rw.c | 2 | ||||
| -rw-r--r-- | innobase/sync/sync0sync.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/innobase/sync/sync0rw.c b/innobase/sync/sync0rw.c index 3d219f27fb6..43f8d646eaa 100644 --- a/innobase/sync/sync0rw.c +++ b/innobase/sync/sync0rw.c @@ -146,7 +146,9 @@ rw_lock_free( /*=========*/ rw_lock_t* lock) /* in: rw-lock */ { +#ifdef UNIV_DEBUG ut_a(rw_lock_validate(lock)); +#endif /* UNIV_DEBUG */ ut_a(rw_lock_get_writer(lock) == RW_LOCK_NOT_LOCKED); ut_a(rw_lock_get_waiters(lock) == 0); ut_a(rw_lock_get_reader_count(lock) == 0); diff --git a/innobase/sync/sync0sync.c b/innobase/sync/sync0sync.c index 5c42876a7bb..e711acbf84e 100644 --- a/innobase/sync/sync0sync.c +++ b/innobase/sync/sync0sync.c @@ -251,7 +251,9 @@ mutex_free( /*=======*/ mutex_t* mutex) /* in: mutex */ { +#ifdef UNIV_DEBUG ut_a(mutex_validate(mutex)); +#endif /* UNIV_DEBUG */ ut_a(mutex_get_lock_word(mutex) == 0); ut_a(mutex_get_waiters(mutex) == 0); |