diff options
| -rw-r--r-- | myisam/ft_parser.c | 4 | ||||
| -rw-r--r-- | mysys/my_symlink2.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/myisam/ft_parser.c b/myisam/ft_parser.c index 543cf998a82..0b1e68b0d70 100644 --- a/myisam/ft_parser.c +++ b/myisam/ft_parser.c @@ -103,7 +103,7 @@ byte ft_get_word(CHARSET_INFO *cs, byte **start, byte *end, FT_WORD *word, FTB_PARAM *param) { byte *doc=*start; - uint mwc, length; + uint mwc, length, mbl; param->yesno=(FTB_YES==' ') ? 1 : (param->quot != 0); param->plusminus=param->pmsign=0; @@ -144,7 +144,7 @@ byte ft_get_word(CHARSET_INFO *cs, byte **start, byte *end, } mwc=length=0; - for (word->pos=doc; doc<end; length++, doc+=my_mbcharlen(cs, *(uchar *)doc)) + for (word->pos=doc; doc<end; length++, mbl=my_mbcharlen(cs, *(uchar *)doc), doc+=(mbl ? mbl : 1)) if (true_word_char(cs,*doc)) mwc=0; else if (!misc_word_char(*doc) || mwc++) diff --git a/mysys/my_symlink2.c b/mysys/my_symlink2.c index 80dca7d56ac..603248e186b 100644 --- a/mysys/my_symlink2.c +++ b/mysys/my_symlink2.c @@ -45,7 +45,7 @@ File my_create_with_symlink(const char *linkname, const char *filename, else { if (linkname) - my_realpath(&abs_linkname, linkname, MYF(0)); + my_realpath(abs_linkname, linkname, MYF(0)); create_link= (linkname && strcmp(abs_linkname,filename)); } |