Commit bb349787 authored by unknown's avatar unknown
Browse files

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 

into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug6-5.0


myisam/ft_parser.c:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
parents d9c7aaf2 69fae29c

myisam/ft_parser.c

+3 −1
Original line number Diff line number Diff line
@@ -196,8 +196,10 @@ byte ft_simple_get_word(CHARSET_INFO *cs, byte **start, const 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++;



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

mysql-test/r/analyze.result

+7 −0
Original line number Diff line number Diff line
@@ -30,3 +30,10 @@ check table t1; 
Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

drop table t1;

CREATE TABLE t1 (a int);

prepare stmt1 from "SELECT * FROM t1 PROCEDURE ANALYSE()";

execute stmt1;

Field_name	Min_value	Max_value	Min_length	Max_length	Empties_or_zeros	Nulls	Avg_value_or_avg_length	Std	Optimal_fieldtype

execute stmt1;

Field_name	Min_value	Max_value	Min_length	Max_length	Empties_or_zeros	Nulls	Avg_value_or_avg_length	Std	Optimal_fieldtype

deallocate prepare stmt1;

mysql-test/r/fulltext.result

+4 −0
Original line number Diff line number Diff line
@@ -429,4 +429,8 @@ REPAIR TABLE t1; 
Table	Op	Msg_type	Msg_text

test.t1	repair	status	OK

SET myisam_repair_threads=@@global.myisam_repair_threads;

INSERT INTO t1 VALUES('testword\'\'');

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

a

testword''

DROP TABLE t1;

mysql-test/t/analyze.test

+9 −0
Original line number Diff line number Diff line
@@ -39,4 +39,13 @@ check table t1; 


drop table t1;



#

# procedure in PS BUG#13673

#

CREATE TABLE t1 (a int);

prepare stmt1 from "SELECT * FROM t1 PROCEDURE ANALYSE()";

execute stmt1;

execute stmt1;

deallocate prepare stmt1;



# End of 4.1 tests

mysql-test/t/fulltext.test

+6 −0
Original line number Diff line number Diff line
@@ -348,6 +348,12 @@ INSERT INTO t1 VALUES('bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'); 
SET myisam_repair_threads=2;

REPAIR TABLE t1;

SET myisam_repair_threads=@@global.myisam_repair_threads;



#

# BUG#5686 - #1034 - Incorrect key file for table - only utf8

#

INSERT INTO t1 VALUES('testword\'\'');

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

DROP TABLE t1;



# End of 4.1 tests