diff options
author | unknown <istruewing@chilla.local> | 2006-10-09 22:24:55 +0200 |
---|---|---|
committer | unknown <istruewing@chilla.local> | 2006-10-09 22:24:55 +0200 |
commit | 1cb23de93fb2176e2d2bbef8e8e0f0d91edc11a4 (patch) | |
tree | 4a97bea85241a7f8e5d5684115f780d44d4bd93a /include/myisam.h | |
parent | a7f8da2904525096fd6cf9c7999ce087ee4d9d4d (diff) | |
parent | 8f8340ab65e55dd0a7d2899728c6e0e707fca241 (diff) | |
download | mariadb-git-1cb23de93fb2176e2d2bbef8e8e0f0d91edc11a4.tar.gz |
Merge chilla.local:/home/mydev/mysql-5.0-bug8283
into chilla.local:/home/mydev/mysql-5.1-bug8283
include/my_sys.h:
Auto merged
include/myisam.h:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
storage/myisam/mi_open.c:
Auto merged
storage/myisam/mi_packrec.c:
Auto merged
storage/myisam/myisamdef.h:
Auto merged
storage/myisam/mi_check.c:
SCCS merged
storage/myisam/sort.c:
SCCS merged
Diffstat (limited to 'include/myisam.h')
-rw-r--r-- | include/myisam.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/myisam.h b/include/myisam.h index 075779a6e42..9e492372f34 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -419,7 +419,7 @@ typedef struct st_mi_check_param uint testflag, key_cache_block_size; uint8 language; my_bool using_global_keycache, opt_lock_memory, opt_follow_links; - my_bool retry_repair, force_sort, calc_checksum; + my_bool retry_repair, force_sort; char temp_filename[FN_REFLEN],*isam_file_name; MY_TMPDIR *tmpdir; int tmpfile_createflag; |