Commit dc3e736b authored by unknown's avatar unknown
Browse files

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

into mysql.com:/Users/kent/mysql/bk/mysql-4.1
parents 384f3acc b1dc9db1

myisam/ft_parser.c

+3 −1
Original line number Diff line number Diff line
@@ -147,8 +147,10 @@ byte ft_get_word(CHARSET_INFO *cs, byte **start, byte *end, 
    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++)

      else if (!misc_word_char(*doc) || mwc)

        break;

      else

        mwc++;



    param->prev='A'; /* be sure *prev is true_word_char */

    word->len= (uint)(doc-word->pos) - mwc;

mysql-test/r/fulltext.result

+3 −0
Original line number Diff line number Diff line
@@ -432,4 +432,7 @@ INSERT INTO t1 VALUES('testword\'\''); 
SELECT a FROM t1 WHERE MATCH a AGAINST('testword' IN BOOLEAN MODE);

a

testword''

SELECT a FROM t1 WHERE MATCH a AGAINST('testword\'\'' IN BOOLEAN MODE);

a

testword''

DROP TABLE t1;

mysql-test/r/ndb_alter_table.result

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ a b c 
2	two	two

alter table t1 drop index c;

select * from t1 where b = 'two';

ERROR HY000: Table definition has changed, please retry transaction

ERROR HY000: Can't lock file (errno: 241)

select * from t1 where b = 'two';

a	b	c

2	two	two

mysql-test/r/ps.result

+19 −0
Original line number Diff line number Diff line
@@ -699,3 +699,22 @@ execute stmt; 
@@tx_isolation

REPEATABLE-READ

deallocate prepare stmt;

prepare stmt from "create temporary table t1 (letter enum('','a','b','c')

not null)";

execute stmt;

drop table t1;

execute stmt;

drop table t1;

execute stmt;

drop table t1;

set names latin1;

prepare stmt from "create table t1 (a enum('test') default 'test')

 character set utf8";

execute stmt;

drop table t1;

execute stmt;

drop table t1;

execute stmt;

drop table t1;

set names default;

deallocate prepare stmt;

mysql-test/r/select.result

+8 −0
Original line number Diff line number Diff line
@@ -2706,3 +2706,11 @@ select distinct count(f2) >0 from t1 left join t2 on f1=f3 group by f1; 
count(f2) >0

1

drop table t1,t2;

create table t1 (f1 int,f2 int);

insert into t1 values(1,1);

create table t2 (f3 int, f4 int, primary key(f3,f4));

insert into t2 values(1,1);

select * from t1 where f1 in (select f3 from t2 where (f3,f4)= (select f3,f4 from t2));

f1	f2

1	1

drop table t1,t2;