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
53043d6f
Commit
53043d6f
authored
17 years ago
by
istruewing@chilla.local
Browse files
Options
Browse Files
Download
Plain Diff
Merge chilla.local:/home/mydev/mysql-5.1-ateam
into chilla.local:/home/mydev/mysql-5.1-bug26827
parents
4ef3110a
5ac6264d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
2 deletions
+13
-2
include/my_bitmap.h
include/my_bitmap.h
+11
-0
sql/sql_partition.cc
sql/sql_partition.cc
+2
-2
No files found.
include/my_bitmap.h
View file @
53043d6f
...
...
@@ -103,6 +103,17 @@ extern void bitmap_lock_invert(MY_BITMAP *map);
&= ~ (1 << ((BIT) & 7)))
#define _bitmap_is_set(MAP, BIT) (uint) (((uchar*)(MAP)->bitmap)[(BIT) / 8] \
& (1 << ((BIT) & 7)))
/*
WARNING!
The below symbols are inline functions in DEBUG builds and macros in
non-DEBUG builds. The latter evaluate their 'bit' argument twice.
NEVER use an increment/decrement operator with the 'bit' argument.
It would work with DEBUG builds, but fails later in production builds!
FORBIDDEN: bitmap_set_bit($my_bitmap, (field++)->field_index);
*/
#ifndef DBUG_OFF
static
inline
void
bitmap_set_bit
(
MY_BITMAP
*
map
,
uint
bit
)
...
...
This diff is collapsed.
Click to expand it.
sql/sql_partition.cc
View file @
53043d6f
...
...
@@ -606,8 +606,8 @@ static bool create_full_part_field_array(THD *thd, TABLE *table,
partitioning.
*/
if
((
ptr
=
part_info
->
full_part_field_array
))
while
(
*
ptr
)
bitmap_set_bit
(
&
part_info
->
full_part_field_set
,
(
*
ptr
++
)
->
field_index
);
for
(;
*
ptr
;
ptr
++
)
bitmap_set_bit
(
&
part_info
->
full_part_field_set
,
(
*
ptr
)
->
field_index
);
end:
DBUG_RETURN
(
result
);
...
...
This diff is collapsed.
Click to expand it.
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