diff options
| author | unknown <bell@sanja.is.com.ua> | 2005-11-15 19:22:00 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2005-11-15 19:22:00 +0200 |
| commit | bb349787ffb803caeb45fbf0ad746cd81b93bedb (patch) | |
| tree | 3c844124bd105797f205a4fb0e13022212552519 | |
| parent | d9c7aaf23ff30675682775864c269bde84a3bc03 (diff) | |
| parent | 69fae29c589e92233cf63ae32bffb9c6023d3780 (diff) | |
| download | mariadb-git-bb349787ffb803caeb45fbf0ad746cd81b93bedb.tar.gz | |
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
| -rw-r--r-- | myisam/ft_parser.c | 4 | ||||
| -rw-r--r-- | mysql-test/r/analyze.result | 7 | ||||
| -rw-r--r-- | mysql-test/r/fulltext.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/analyze.test | 9 | ||||
| -rw-r--r-- | mysql-test/t/fulltext.test | 6 |
5 files changed, 29 insertions, 1 deletions
diff --git a/myisam/ft_parser.c b/myisam/ft_parser.c index 2fad2363ae2..9198f89ee35 100644 --- a/myisam/ft_parser.c +++ b/myisam/ft_parser.c @@ -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; diff --git a/mysql-test/r/analyze.result b/mysql-test/r/analyze.result index 0b44a502b13..796b382f5d6 100644 --- a/mysql-test/r/analyze.result +++ b/mysql-test/r/analyze.result @@ -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; diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result index ea0ffe9d7dd..f0d323670e0 100644 --- a/mysql-test/r/fulltext.result +++ b/mysql-test/r/fulltext.result @@ -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; diff --git a/mysql-test/t/analyze.test b/mysql-test/t/analyze.test index 3c3b3933bc3..5d653b65579 100644 --- a/mysql-test/t/analyze.test +++ b/mysql-test/t/analyze.test @@ -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 diff --git a/mysql-test/t/fulltext.test b/mysql-test/t/fulltext.test index 08648f4e0a6..b52c5d0ec08 100644 --- a/mysql-test/t/fulltext.test +++ b/mysql-test/t/fulltext.test @@ -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 |