summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authorunknown <holyfoot/hf@mysql.com/hfmain.(none)>2007-11-19 11:03:03 +0400
committerunknown <holyfoot/hf@mysql.com/hfmain.(none)>2007-11-19 11:03:03 +0400
commitda1efa3387e62df85d48f05e81ac9b324c455e83 (patch)
treecb2b107014561daee7911fb4fc491dfbb65509b3 /myisam
parent2e01bfc4f48bd77fa3a7a7555a725cec66cd00ef (diff)
downloadmariadb-git-da1efa3387e62df85d48f05e81ac9b324c455e83.tar.gz
Bug #30284 spatial key corruption.
SPATIAL key is fine actually, but the chk_key() function mistakenly returns error. It tries to compare checksums of btree and SPATIAL keys while the checksum for the SPATIAL isn't calculated (always 0). Same thing with FULLTEXT keys is handled using full_text_keys counter, so fixed by counting both SPATIAL and FULLTEXT keys in that counter. myisam/mi_check.c: Bug #30284 spatial key corruption full_text_keys counts both FULL_TEXT and SPATIAL keys mysql-test/r/gis.result: Bug #30284 spatial key corruption test result mysql-test/t/gis.test: Bug #30284 spatial key corruption. test case
Diffstat (limited to 'myisam')
-rw-r--r--myisam/mi_check.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/mi_check.c b/myisam/mi_check.c
index ce8fb04874e..64aa0b76877 100644
--- a/myisam/mi_check.c
+++ b/myisam/mi_check.c
@@ -454,7 +454,7 @@ int chk_key(MI_CHECK *param, register MI_INFO *info)
if ((!(param->testflag & T_SILENT)))
printf ("- check data record references index: %d\n",key+1);
- if (keyinfo->flag & HA_FULLTEXT)
+ if (keyinfo->flag & (HA_FULLTEXT | HA_SPATIAL))
full_text_keys++;
if (share->state.key_root[key] == HA_OFFSET_ERROR &&
(info->state->records == 0 || keyinfo->flag & HA_FULLTEXT))