Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
a2b81283
Commit
a2b81283
authored
Nov 15, 2005
by
bell@sanja.is.com.ua
Browse files
Options
Browse Files
Download
Plain Diff
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
parents
15df2c22
297639bd
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
29 additions
and
1 deletion
+29
-1
myisam/ft_parser.c
myisam/ft_parser.c
+3
-1
mysql-test/r/analyze.result
mysql-test/r/analyze.result
+7
-0
mysql-test/r/fulltext.result
mysql-test/r/fulltext.result
+4
-0
mysql-test/t/analyze.test
mysql-test/t/analyze.test
+9
-0
mysql-test/t/fulltext.test
mysql-test/t/fulltext.test
+6
-0
No files found.
myisam/ft_parser.c
View file @
a2b81283
...
...
@@ -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
View file @
a2b81283
...
...
@@ -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
View file @
a2b81283
...
...
@@ -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
View file @
a2b81283
...
...
@@ -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
View file @
a2b81283
...
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment