diff options
author | unknown <istruewing@chilla.local> | 2006-10-09 19:40:16 +0200 |
---|---|---|
committer | unknown <istruewing@chilla.local> | 2006-10-09 19:40:16 +0200 |
commit | 679b5848f3af7e1833385ef20d099dfde277b8c0 (patch) | |
tree | 0e7a9e04f150454fb4be2e33abfcfd7d254dd63e /include/myisam.h | |
parent | a6a93d6f19d8e97a4fb4b9b7e51dd76c4dd6c6a6 (diff) | |
parent | 3109da7719e38d0a5ea8f8df964ee31f5deeed70 (diff) | |
download | mariadb-git-679b5848f3af7e1833385ef20d099dfde277b8c0.tar.gz |
Merge chilla.local:/home/mydev/mysql-4.1-bug8283
into chilla.local:/home/mydev/mysql-4.1-bug8283-one
myisam/mi_check.c:
Auto merged
myisam/mi_packrec.c:
Auto merged
myisam/sort.c:
Auto merged
mysql-test/r/myisam.result:
Bug#8283 - OPTIMIZE TABLE causes data loss
Manual merge
mysql-test/t/myisam.test:
Bug#8283 - OPTIMIZE TABLE causes data loss
Manual merge
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 c2d3d99a414..0a808070748 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -345,7 +345,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; |