diff options
| author | unknown <istruewing@chilla.local> | 2007-01-18 11:35:54 +0100 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-01-18 11:35:54 +0100 |
| commit | d1ce7f6f73fa678ff5ab80a703a245b626b648e5 (patch) | |
| tree | e630c7e937c40d0be6ff820b69f9141c3c9df67f /myisam | |
| parent | c7fb31ca108a546e2b2c37f0742aa34a0fb6fb0f (diff) | |
| parent | 2456c61d3971ae6a37beeb78ad2efc6809b6694d (diff) | |
| download | mariadb-git-d1ce7f6f73fa678ff5ab80a703a245b626b648e5.tar.gz | |
Merge chilla.local:/home/mydev/mysql-4.1-bug24607
into chilla.local:/home/mydev/mysql-5.0-bug24607
myisam/mi_create.c:
Auto merged
mysql-test/r/myisam.result:
Manual merge.
mysql-test/t/myisam.test:
Manual merge.
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_create.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/myisam/mi_create.c b/myisam/mi_create.c index d99c74f6136..d46672444e0 100644 --- a/myisam/mi_create.c +++ b/myisam/mi_create.c @@ -815,18 +815,19 @@ uint mi_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 >= (longlong) 1 << 56) + if (file_length >= ULL(1) << 56) def=8; + else #endif - if (file_length >= (longlong) 1 << 48) + if (file_length >= ULL(1) << 48) def=7; - if (file_length >= (longlong) 1 << 40) + else if (file_length >= ULL(1) << 40) def=6; - else if (file_length >= (longlong) 1 << 32) + else if (file_length >= ULL(1) << 32) def=5; - else if (file_length >= (1L << 24)) + else if (file_length >= ULL(1) << 24) def=4; - else if (file_length >= (1L << 16)) + else if (file_length >= ULL(1) << 16) def=3; else def=2; |