diff options
author | Sergei Golubchik <sergii@pisem.net> | 2013-04-15 15:09:22 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-15 15:09:22 +0200 |
commit | a9035be5b7a7b3865ddb4ef34a5d0cfc65dfc254 (patch) | |
tree | a9df7341e91623f62fe37cd47fce139d8888fc95 /storage/maria/ma_create.c | |
parent | 3a1c91d87d69ef243b3e78be6089102cafef0a8e (diff) | |
parent | f57ecb7786177e0af3b1e3ec94302720b2e0f967 (diff) | |
download | mariadb-git-a9035be5b7a7b3865ddb4ef34a5d0cfc65dfc254.tar.gz |
10.0-base merge
Diffstat (limited to 'storage/maria/ma_create.c')
-rw-r--r-- | storage/maria/ma_create.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/storage/maria/ma_create.c b/storage/maria/ma_create.c index 28c3491730f..4ed00598c2f 100644 --- a/storage/maria/ma_create.c +++ b/storage/maria/ma_create.c @@ -1215,19 +1215,19 @@ uint maria_get_pointer_length(ulonglong file_length, uint def) if (file_length) /* If not default */ { #ifdef NOT_YET_READY_FOR_8_BYTE_POINTERS - if (file_length >= (ULL(1) << 56)) + if (file_length >= (1ULL << 56)) def=8; else #endif - if (file_length >= (ULL(1) << 48)) + if (file_length >= (1ULL << 48)) def=7; - else if (file_length >= (ULL(1) << 40)) + else if (file_length >= (1ULL << 40)) def=6; - else if (file_length >= (ULL(1) << 32)) + else if (file_length >= (1ULL << 32)) def=5; - else if (file_length >= (ULL(1) << 24)) + else if (file_length >= (1ULL << 24)) def=4; - else if (file_length >= (ULL(1) << 16)) + else if (file_length >= (1ULL << 16)) def=3; else def=2; |