summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2004-05-01 15:41:59 +0200
committerunknown <serg@serg.mylan>2004-05-01 15:41:59 +0200
commit66f2d8bffa093629d90244e4c9aca7a5d1542ded (patch)
tree2102c0bebbd328026c172370dd5c0a06449b4b9e /myisam
parent4173696d65b6688c6864cfb6265880237f57d271 (diff)
downloadmariadb-git-66f2d8bffa093629d90244e4c9aca7a5d1542ded.tar.gz
myisam_data_pointer_size
include/mysql.h: compatibility fix
Diffstat (limited to 'myisam')
-rw-r--r--myisam/mi_create.c4
-rw-r--r--myisam/mi_info.c3
-rw-r--r--myisam/mi_static.c1
3 files changed, 5 insertions, 3 deletions
diff --git a/myisam/mi_create.c b/myisam/mi_create.c
index 5682862c39a..838d647ea56 100644
--- a/myisam/mi_create.c
+++ b/myisam/mi_create.c
@@ -206,9 +206,9 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
3 : 0)));
if (options & (HA_OPTION_COMPRESS_RECORD | HA_OPTION_PACK_RECORD))
- pointer=mi_get_pointer_length(ci->data_file_length,4);
+ pointer=mi_get_pointer_length(ci->data_file_length,myisam_data_pointer_size);
else
- pointer=mi_get_pointer_length(ci->max_rows,4);
+ pointer=mi_get_pointer_length(ci->max_rows,myisam_data_pointer_size);
if (!(max_rows=(ulonglong) ci->max_rows))
max_rows= ((((ulonglong) 1 << (pointer*8)) -1) / min_pack_length);
diff --git a/myisam/mi_info.c b/myisam/mi_info.c
index f4eace198f9..cf63ef63618 100644
--- a/myisam/mi_info.c
+++ b/myisam/mi_info.c
@@ -75,7 +75,8 @@ int mi_status(MI_INFO *info, register MI_ISAMINFO *x, uint flag)
x->filenr = info->dfile;
x->options = share->options;
x->create_time=share->state.create_time;
- x->reflength= mi_get_pointer_length(share->base.max_data_file_length,4);
+ x->reflength= mi_get_pointer_length(share->base.max_data_file_length,
+ myisam_data_pointer_size);
x->record_offset= ((share->options &
(HA_OPTION_PACK_RECORD | HA_OPTION_COMPRESS_RECORD)) ?
0L : share->base.pack_reclength);
diff --git a/myisam/mi_static.c b/myisam/mi_static.c
index a36c38e3c01..f7d008ffbb7 100644
--- a/myisam/mi_static.c
+++ b/myisam/mi_static.c
@@ -41,6 +41,7 @@ my_bool myisam_concurrent_insert=0;
my_off_t myisam_max_extra_temp_length= MI_MAX_TEMP_LENGTH;
my_off_t myisam_max_temp_length= MAX_FILE_SIZE;
ulong myisam_bulk_insert_tree_size=8192*1024;
+ulong myisam_data_pointer_size=4;
/*
read_vec[] is used for converting between P_READ_KEY.. and SEARCH_