diff options
| author | unknown <serg@serg.mylan> | 2004-06-23 12:36:07 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-06-23 12:36:07 +0200 |
| commit | 55c8a6c12230862e9d54d2f1b0f3791ac1402a4c (patch) | |
| tree | f131301a9d0f77a68268ec331013df866919066f /myisam | |
| parent | 98c1dcd341e2afab753e1c3fa4dd382088ad0146 (diff) | |
| parent | ee8ee8cab395b755c3153a971c125c371b083b71 (diff) | |
| download | mariadb-git-55c8a6c12230862e9d54d2f1b0f3791ac1402a4c.tar.gz | |
merged
configure.in:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
sql/field.cc:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/lex.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/unireg.cc:
Auto merged
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_static.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/mi_static.c b/myisam/mi_static.c index f7d008ffbb7..f41aeff8453 100644 --- a/myisam/mi_static.c +++ b/myisam/mi_static.c @@ -38,7 +38,7 @@ my_bool myisam_concurrent_insert=1; #else my_bool myisam_concurrent_insert=0; #endif -my_off_t myisam_max_extra_temp_length= MI_MAX_TEMP_LENGTH; +my_off_t myisam_max_extra_temp_length= (my_off_t)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; |