diff options
| author | monty@mysql.com/narttu.mysql.fi <> | 2006-11-29 17:25:23 +0200 |
|---|---|---|
| committer | monty@mysql.com/narttu.mysql.fi <> | 2006-11-29 17:25:23 +0200 |
| commit | 8aec636ba82f3544a8f157ba93cc81570c4ec6d4 (patch) | |
| tree | ff98751356d1d8efd5d39454189c006ce366502d /include | |
| parent | b67ff612d3d17d6806d1f85f2c4b7b5c6d1e3800 (diff) | |
| parent | 9c3a2a0d8e492f6595d82290fc17f2279dd9707a (diff) | |
| download | mariadb-git-8aec636ba82f3544a8f157ba93cc81570c4ec6d4.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'include')
| -rw-r--r-- | include/heap.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/heap.h b/include/heap.h index cfbb6113f86..4255ee52b18 100644 --- a/include/heap.h +++ b/include/heap.h @@ -46,8 +46,8 @@ typedef struct st_heapinfo /* Struct from heap_info */ ulong records; /* Records in database */ ulong deleted; /* Deleted records in database */ ulong max_records; - ulong data_length; - ulong index_length; + ulonglong data_length; + ulonglong index_length; uint reclength; /* Length of one record */ int errkey; ulonglong auto_increment; @@ -135,7 +135,7 @@ typedef struct st_heap_share HP_BLOCK block; HP_KEYDEF *keydef; ulong min_records,max_records; /* Params to open */ - ulong data_length,index_length,max_table_size; + ulonglong data_length,index_length,max_table_size; uint key_stat_version; /* version to indicate insert/delete */ uint records; /* records */ uint blength; /* records rounded up to 2^n */ @@ -187,7 +187,7 @@ typedef struct st_heap_create_info { uint auto_key; /* keynr [1 - maxkey] for auto key */ uint auto_key_type; - ulong max_table_size; + ulonglong max_table_size; ulonglong auto_increment; my_bool with_auto_increment; } HP_CREATE_INFO; |