diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-06-22 00:20:28 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-06-22 10:40:28 +0200 |
| commit | 805703fa8e9dd2dc09b9e3a2b8d7786e541621ff (patch) | |
| tree | 745a252d7675a30fa891a729aae93243cd0d9d13 /storage | |
| parent | b760a69e1a000a87e7a618be28aa985c6cf2bfd4 (diff) | |
| download | mariadb-git-805703fa8e9dd2dc09b9e3a2b8d7786e541621ff.tar.gz | |
Fixed for failures in buildbot: Windows
fix constants to stay 64-bit instead of being truncated by VS.
this fixes a hang on startup.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/xtradb/include/os0sync.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/xtradb/include/os0sync.h b/storage/xtradb/include/os0sync.h index 9bbb0bb7b5f..0f93f3ff074 100644 --- a/storage/xtradb/include/os0sync.h +++ b/storage/xtradb/include/os0sync.h @@ -96,8 +96,8 @@ struct os_event { private: /** Masks for the event signal count and set flag in the count_and_set field */ - enum { count_mask = 0x7fffffffffffffffULL, - set_mask = 0x8000000000000000ULL}; + static const ib_uint64_t count_mask = 0x7fffffffffffffffULL; + static const ib_uint64_t set_mask = 0x8000000000000000ULL; /** The MSB is set whenever when the event is in the signaled state, i.e. a thread does not stop if it tries to wait for this event. Lower |