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
80c13daa
Commit
80c13daa
authored
Oct 09, 2002
by
serg@serg.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
parents
57486309
32dff16a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
2 deletions
+25
-2
myisam/mi_check.c
myisam/mi_check.c
+4
-2
mysql-test/r/fulltext.result
mysql-test/r/fulltext.result
+9
-0
mysql-test/t/fulltext.test
mysql-test/t/fulltext.test
+12
-0
No files found.
myisam/mi_check.c
View file @
80c13daa
...
...
@@ -2529,7 +2529,7 @@ static int sort_ft_key_read(MI_SORT_PARAM *sort_param, void *key)
if
(
!
sort_param
->
wordlist
)
{
do
for
(;;)
{
my_free
((
char
*
)
wptr
,
MYF
(
MY_ALLOW_ZERO_PTR
));
if
((
error
=
sort_get_next_record
(
sort_param
)))
...
...
@@ -2537,9 +2537,10 @@ static int sort_ft_key_read(MI_SORT_PARAM *sort_param, void *key)
if
(
!
(
wptr
=
_mi_ft_parserecord
(
info
,
sort_param
->
key
,
key
,
sort_param
->
record
)))
DBUG_RETURN
(
1
);
if
(
wptr
->
pos
)
break
;
error
=
sort_write_record
(
sort_param
);
}
while
(
!
wptr
->
pos
);
sort_param
->
wordptr
=
sort_param
->
wordlist
=
wptr
;
}
else
...
...
@@ -2560,6 +2561,7 @@ static int sort_ft_key_read(MI_SORT_PARAM *sort_param, void *key)
{
my_free
((
char
*
)
sort_param
->
wordlist
,
MYF
(
0
));
sort_param
->
wordlist
=
0
;
error
=
sort_write_record
(
sort_param
);
}
else
sort_param
->
wordptr
=
(
void
*
)
wptr
;
...
...
mysql-test/r/fulltext.result
View file @
80c13daa
...
...
@@ -203,3 +203,12 @@ select 8 from t1;
8
8
drop table t1;
drop table if exists t1;
create table t1 (a text, fulltext key (a));
insert into t1 values ('aaaa');
repair table t1;
Table Op Msg_type Msg_text
test.t1 repair status OK
select * from t1 where match (a) against ('aaaa');
a
drop table t1;
mysql-test/t/fulltext.test
View file @
80c13daa
...
...
@@ -160,3 +160,15 @@ INSERT INTO t1 VALUES (1,'my small mouse'),(2,'la-la-la'),(3,'It is so funny'),(
select
8
from
t1
;
drop
table
t1
;
#
# Check bug reported by Julian Ladisch
# ERROR 1030: Got error 127 from table handler
#
drop
table
if
exists
t1
;
create
table
t1
(
a
text
,
fulltext
key
(
a
));
insert
into
t1
values
(
'aaaa'
);
repair
table
t1
;
select
*
from
t1
where
match
(
a
)
against
(
'aaaa'
);
drop
table
t1
;
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