mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 11:57:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge chilla.local:/home/mydev/mysql-4.1-bug24607

Browse source 
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.
This commit is contained in:
unknown 2007-01-18 11:35:54 +01:00
commit d1ce7f6f73
3 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
myisam/mi_create.c
View file

@ -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;