diff options
| author | unknown <istruewing@chilla.local> | 2006-10-09 20:03:12 +0200 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2006-10-09 20:03:12 +0200 |
| commit | 0cbc1c1f9fd36a6d407073a85690504a862c03ad (patch) | |
| tree | ddc4b70cec5efe547e1b808aa7e197604f09e845 /include/myisam.h | |
| parent | 5ca46fd115effdf87e975369e3aaab741c7cc8fa (diff) | |
| parent | f127cbb6f133122d738c5d897175614f79d299a0 (diff) | |
| download | mariadb-git-0cbc1c1f9fd36a6d407073a85690504a862c03ad.tar.gz | |
Merge chilla.local:/home/mydev/mysql-4.1-bug8283-one
into chilla.local:/home/mydev/mysql-5.0-bug8283
include/my_sys.h:
Auto merged
include/myisam.h:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_open.c:
Auto merged
myisam/mi_packrec.c:
Auto merged
myisam/sort.c:
Auto merged
mysql-test/t/myisam.test:
Auto merged
myisam/myisamdef.h:
Bug#8283 - OPTIMIZE TABLE causes data loss
Merge from 4.1
mysql-test/r/myisam.result:
Bug#8283 - OPTIMIZE TABLE causes data loss
Merge from 4.1
mysys/mf_iocache.c:
Bug#8283 - OPTIMIZE TABLE causes data loss
Merge from 4.1
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 321952dcf4c..95852366251 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; |