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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
40c2ce10
Commit
40c2ce10
authored
Oct 30, 2003
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
post-merge fixes
parent
c797519e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
5 deletions
+14
-5
mysql-test/t/fulltext.test
mysql-test/t/fulltext.test
+2
-2
mysys/my_bitmap.c
mysys/my_bitmap.c
+12
-3
No files found.
mysql-test/t/fulltext.test
View file @
40c2ce10
...
...
@@ -131,9 +131,9 @@ select * from t2 having MATCH inhalt AGAINST ('foobar');
# check of fulltext errors
#
--
error
128
0
--
error
128
1
CREATE
TABLE
t3
(
t
int
(
11
),
i
text
,
fulltext
tix
(
t
,
i
));
--
error
128
0
--
error
128
1
CREATE
TABLE
t3
(
t
int
(
11
),
i
text
,
j
varchar
(
200
)
CHARACTER
SET
latin2
,
fulltext
tix
(
i
,
j
));
...
...
mysys/my_bitmap.c
View file @
40c2ce10
...
...
@@ -26,6 +26,8 @@
must be within bitmap size
* bitmap_set_prefix() is an exception - one can use ~0 to set all bits
* when both arguments are bitmaps, they must be of the same size
* bitmap_intersect() is an exception :)
(for for Bitmap::intersect(ulonglong map2buff))
TODO:
Make assembler THREAD safe versions of these using test-and-set instructions
...
...
@@ -244,17 +246,24 @@ my_bool bitmap_cmp(const MY_BITMAP *map1, const MY_BITMAP *map2)
void
bitmap_intersect
(
MY_BITMAP
*
map
,
const
MY_BITMAP
*
map2
)
{
uchar
*
to
=
map
->
bitmap
,
*
from
=
map2
->
bitmap
,
*
end
;
uint
len
=
map
->
bitmap_size
,
len2
=
map2
->
bitmap
;
DBUG_ASSERT
(
map
->
bitmap
&&
map2
->
bitmap
&&
map
->
bitmap_size
==
map2
->
bitmap_size
);
DBUG_ASSERT
(
map
->
bitmap
&&
map2
->
bitmap
);
bitmap_lock
(
map
);
bitmap_lock
(
map2
);
end
=
to
+
m
ap
->
bitmap_size
;
end
=
to
+
m
in
(
len
,
len2
)
;
while
(
to
<
end
)
*
to
++
&=
*
from
++
;
if
(
len2
<
len
)
{
end
+=
len
-
len2
;
while
(
to
<
end
)
*
to
++=
0
;
}
bitmap_unlock
(
map2
);
bitmap_unlock
(
map
);
}
...
...
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