summaryrefslogtreecommitdiff
path: root/myisam/mi_open.c
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-11-07 00:19:36 +0200
committerunknown <monty@hundin.mysql.fi>2001-11-07 00:19:36 +0200
commitd207a0c2f022d0a65e95cddf8a1dc957f0e0a34e (patch)
treef1c7979e7d8282f034f3cabdfe558293a7f7c2f4 /myisam/mi_open.c
parent228408a8c54e34922832082c0e36c1e87f224873 (diff)
parent3c0487c4c31c516c745a020f2c1b2e836cb28d86 (diff)
downloadmariadb-git-d207a0c2f022d0a65e95cddf8a1dc957f0e0a34e.tar.gz
merge
innobase/include/srv0srv.h: Auto merged mysql-test/mysql-test-run.sh: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/srv/srv0start.c: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/ha_innobase.cc: Auto merged
Diffstat (limited to 'myisam/mi_open.c')
-rw-r--r--myisam/mi_open.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/myisam/mi_open.c b/myisam/mi_open.c
index 7e72b818751..64707479d11 100644
--- a/myisam/mi_open.c
+++ b/myisam/mi_open.c
@@ -305,16 +305,16 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
}
}
}
- if (share->keyinfo[i].flag & HA_FULLTEXT) /* SerG */
+ if (share->keyinfo[i].flag & HA_FULLTEXT)
{
- share->keyinfo[i].seg=pos-FT_SEGS; /* SerG */
+ share->keyinfo[i].seg=pos-FT_SEGS;
share->fulltext_index=1;
}
share->keyinfo[i].end=pos;
pos->type=HA_KEYTYPE_END; /* End */
pos->length=share->base.rec_reflength;
pos->null_bit=0;
- pos->flag=0;
+ pos->flag=0; /* For purify */
pos++;
}
for (i=0 ; i < uniques ; i++)
@@ -338,6 +338,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
share->uniqueinfo[i].end=pos;
pos->type=HA_KEYTYPE_END; /* End */
pos->null_bit=0;
+ pos->flag=0;
pos++;
}
}