summaryrefslogtreecommitdiff
path: root/include/heap.h
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2006-11-29 23:07:15 +0200
committerunknown <monty@narttu.mysql.fi>2006-11-29 23:07:15 +0200
commitc0c013e5b75b88081b6a8a693a777aaf6a574a66 (patch)
tree0db898dfb17cf8ad28801621ce4c81f19c7e9cc9 /include/heap.h
parent6bcbd7df1e3402fbc8b6730868115a2bb253f7a7 (diff)
parent42fd48da99b2ba2641697ebb567af555fb270e9e (diff)
downloadmariadb-git-c0c013e5b75b88081b6a8a693a777aaf6a574a66.tar.gz
Merge mysql.com:/home/my/mysql-5.0
into mysql.com:/home/my/mysql-5.1 BitKeeper/etc/ignore: auto-union include/heap.h: Auto merged include/my_pthread.h: Auto merged mysql-test/r/show_check.result: Auto merged mysql-test/r/type_bit.result: Auto merged sql/item_sum.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_select.cc: Auto merged storage/heap/ha_heap.cc: Auto merged mysys/my_thr_init.c: Manual merge sql/mysqld.cc: Manual merge sql/sql_class.h: Manual merge sql/table.cc: Manual merge
Diffstat (limited to 'include/heap.h')
-rw-r--r--include/heap.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/heap.h b/include/heap.h
index 69d1e441a4b..ea02b30e49b 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;