Commit 16ed686a authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 

into serg.mylan:/usr/home/serg/Abk/mysql-4.1


mysql-test/r/fulltext.result:
  Auto merged
parents 6e781e11 13ff3fa4

myisam/mi_check.c

+1 −1
Original line number Diff line number Diff line
@@ -2037,7 +2037,7 @@ int mi_repair_by_sort(MI_CHECK *param, register MI_INFO *info, 
      uint ft_max_word_len_for_sort=FT_MAX_WORD_LEN_FOR_SORT*

                                    sort_param.keyinfo->seg->charset->mbmaxlen;

      sort_info.max_records=

        (ha_rows) (sort_info.filelength/ft_max_word_len_for_sort+1);

        (ha_rows) (sort_info.filelength/ft_min_word_len+1);



      sort_param.key_read=sort_ft_key_read;

      sort_param.key_write=sort_ft_key_write;

mysql-test/r/fulltext.result

+3 −0
Original line number Diff line number Diff line
@@ -330,6 +330,9 @@ t1_id name t2_id t1_id name 
select * from t2 where match name against ('a* b* c* d* e* f*' in boolean mode);

t2_id	t1_id	name

drop table t1,t2;

create table t1 (a text, fulltext key (a));

insert into t1 select "xxxx yyyy zzzz";

drop table t1;

SET NAMES latin1;

CREATE TABLE t1 (t text character set utf8 not null, fulltext(t));

INSERT t1 VALUES ('Mit freundlichem Gr'), ('aus Osnabrck');

mysql-test/t/ctype_utf8.test

+1 −0
Original line number Diff line number Diff line
@@ -645,6 +645,7 @@ insert into t1 values(1,'foo'),(2,'foobar'); 
select * from t1 where b like 'foob%';

--disable_warnings

alter table t1 engine=bdb;

--enable_warnings

select * from t1 where b like 'foob%';

drop table t1;

mysql-test/t/fulltext.test

+8 −1
Original line number Diff line number Diff line
@@ -253,9 +253,16 @@ select * from t1 join t2 using(`t1_id`) where match (t1.name, t2.name) against(' 
# bug with many short (< ft_min_word_len) words in boolean search

#

select * from t2 where match name against ('a* b* c* d* e* f*' in boolean mode);



drop table t1,t2;



#

# bug with repair-by-sort and incorrect records estimation

#



create table t1 (a text, fulltext key (a));

insert into t1 select "xxxx yyyy zzzz";

drop table t1;



#

# UTF8

#