diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-04-07 14:00:16 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-07 14:00:16 +0200 |
| commit | 4ec6fe10e56de0cf9b4dbc649b8552ae39c2c500 (patch) | |
| tree | fbc0352dd0f6bf00d934e96e6b3af99a1cfe0b2c /storage/maria/ma_pagecache.c | |
| parent | ef5241ae05b0f1bdf3668b4f0876bf0b4fe309a0 (diff) | |
| download | mariadb-git-4ec6fe10e56de0cf9b4dbc649b8552ae39c2c500.tar.gz | |
remove ULL() and LL(), because they're totally unnecessary
and sometimes harmful (used with expressions)
Diffstat (limited to 'storage/maria/ma_pagecache.c')
| -rw-r--r-- | storage/maria/ma_pagecache.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/storage/maria/ma_pagecache.c b/storage/maria/ma_pagecache.c index 6aaccea219f..4a3c3efd3fb 100644 --- a/storage/maria/ma_pagecache.c +++ b/storage/maria/ma_pagecache.c @@ -1650,7 +1650,7 @@ static void unlink_hash(PAGECACHE *pagecache, PAGECACHE_HASH_LINK *hash_link) struct st_my_thread_var *thread; hash_link->file= first_page->file; - DBUG_ASSERT(first_page->pageno < ((ULL(1)) << 40)); + DBUG_ASSERT(first_page->pageno < ((1ULL) << 40)); hash_link->pageno= first_page->pageno; do { @@ -1813,7 +1813,7 @@ restart: goto restart; } hash_link->file= *file; - DBUG_ASSERT(pageno < ((ULL(1)) << 40)); + DBUG_ASSERT(pageno < ((1ULL) << 40)); hash_link->pageno= pageno; link_hash(start, hash_link); /* Register the request for the page */ @@ -3357,7 +3357,7 @@ uchar *pagecache_read(PAGECACHE *pagecache, page_cache_page_pin_str[unlock_pin])); DBUG_ASSERT(buff != 0 || (buff == 0 && (unlock_pin == PAGECACHE_PIN || unlock_pin == PAGECACHE_PIN_LEFT_PINNED))); - DBUG_ASSERT(pageno < ((ULL(1)) << 40)); + DBUG_ASSERT(pageno < ((1ULL) << 40)); #endif if (!page_link) @@ -3797,7 +3797,7 @@ my_bool pagecache_delete(PAGECACHE *pagecache, pin == PAGECACHE_PIN_LEFT_PINNED); restart: - DBUG_ASSERT(pageno < ((ULL(1)) << 40)); + DBUG_ASSERT(pageno < ((1ULL) << 40)); if (pagecache->can_be_used) { /* Key cache is used */ @@ -3977,7 +3977,7 @@ my_bool pagecache_write_part(PAGECACHE *pagecache, DBUG_ASSERT(lock != PAGECACHE_LOCK_LEFT_READLOCKED); DBUG_ASSERT(lock != PAGECACHE_LOCK_READ_UNLOCK); DBUG_ASSERT(offset + size <= pagecache->block_size); - DBUG_ASSERT(pageno < ((ULL(1)) << 40)); + DBUG_ASSERT(pageno < ((1ULL) << 40)); #endif if (!page_link) @@ -4974,7 +4974,7 @@ my_bool pagecache_collect_changed_blocks_with_lsn(PAGECACHE *pagecache, ptr+= 2; ptr[0]= (share->kfile.file == block->hash_link->file.file); ptr++; - DBUG_ASSERT(block->hash_link->pageno < ((ULL(1)) << 40)); + DBUG_ASSERT(block->hash_link->pageno < ((1ULL) << 40)); page_store(ptr, block->hash_link->pageno); ptr+= PAGE_STORE_SIZE; lsn_store(ptr, block->rec_lsn); |