diff options
| author | unknown <heikki@hundin.mysql.fi> | 2002-03-21 18:24:26 +0200 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2002-03-21 18:24:26 +0200 |
| commit | d8aa9df16f7212f8c7b60e5471d235407a12e6be (patch) | |
| tree | acd1e47e1320565f7c5b560821696005be23637f | |
| parent | 5c6303581102c8dd393930e62bb47e37309d06f0 (diff) | |
| download | mariadb-git-d8aa9df16f7212f8c7b60e5471d235407a12e6be.tar.gz | |
sync0rw.ic, ut0byte.ic:
Forgot to merge these to 3.23.50
innobase/include/sync0rw.ic:
Forgot to merge these to 3.23.50
innobase/include/ut0byte.ic:
Forgot to merge these to 3.23.50
| -rw-r--r-- | innobase/include/sync0rw.ic | 2 | ||||
| -rw-r--r-- | innobase/include/ut0byte.ic | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/innobase/include/sync0rw.ic b/innobase/include/sync0rw.ic index 2a02cfb6a53..af5c4576da6 100644 --- a/innobase/include/sync0rw.ic +++ b/innobase/include/sync0rw.ic @@ -356,7 +356,7 @@ rw_lock_s_unlock_func( /* Reset the shared lock by decrementing the reader count */ - ut_ad(lock->reader_count > 0); + ut_a(lock->reader_count > 0); lock->reader_count--; #ifdef UNIV_SYNC_DEBUG diff --git a/innobase/include/ut0byte.ic b/innobase/include/ut0byte.ic index b8170392c8f..f0df9cc35a3 100644 --- a/innobase/include/ut0byte.ic +++ b/innobase/include/ut0byte.ic @@ -52,6 +52,20 @@ ut_dulint_get_low( } /*********************************************************** +Converts a dulint (a struct of 2 ulints) to ib_longlong, which is a 64-bit +integer type. */ +UNIV_INLINE +ib_longlong +ut_conv_dulint_to_longlong( +/*=======================*/ + /* out: value in ib_longlong type */ + dulint d) /* in: dulint */ +{ + return((ib_longlong)d.low + + (((ib_longlong)d.high) << 32)); +} + +/*********************************************************** Tests if a dulint is zero. */ UNIV_INLINE ibool |