diff options
| author | unknown <monty@mysql.com> | 2004-03-25 15:05:42 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-25 15:05:42 +0200 |
| commit | d78cb8998133d98b595b791379b9d1424c103962 (patch) | |
| tree | b090f762169aabf4fa3602b52d4463cd9c66106b /myisam/mi_check.c | |
| parent | 7674fd064c7a2d8b2efec1ee8d7b4eaae0dd7fc5 (diff) | |
| parent | 3c46af6cf4e935683e5288c55f8b4ff4badaa553 (diff) | |
| download | mariadb-git-d78cb8998133d98b595b791379b9d1424c103962.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
myisam/mi_check.c:
Auto merged
sql/field.cc:
Auto merged
strings/ctype-sjis.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
Diffstat (limited to 'myisam/mi_check.c')
| -rw-r--r-- | myisam/mi_check.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/mi_check.c b/myisam/mi_check.c index 79167a885cd..433724a21e6 100644 --- a/myisam/mi_check.c +++ b/myisam/mi_check.c @@ -3314,7 +3314,7 @@ static int sort_ft_key_write(MI_SORT_PARAM *sort_param, const void *a) if (val_off == a_len && mi_compare_text(sort_param->seg->charset, ((uchar *)a)+1,a_len-1, - ft_buf->lastkey+1,val_off-1, 0)==0) + ft_buf->lastkey+1,val_off-1, 0, 0)==0) { if (!ft_buf->buf) /* store in second-level tree */ { |