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
0ef0c541
Commit
0ef0c541
authored
Apr 26, 2011
by
Mattias Jonsson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
post fix for werror build for bug#11766249.
parent
1f617e74
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
sql/ha_partition.cc
sql/ha_partition.cc
+5
-5
No files found.
sql/ha_partition.cc
View file @
0ef0c541
...
...
@@ -2587,7 +2587,7 @@ void ha_data_partition_destroy(void *ha_data)
int
ha_partition
::
open
(
const
char
*
name
,
int
mode
,
uint
test_if_locked
)
{
char
*
name_buffer_ptr
;
int
error
;
int
error
=
HA_ERR_INITIALIZATION
;
uint
alloc_len
;
handler
**
file
;
char
name_buff
[
FN_REFLEN
];
...
...
@@ -2601,7 +2601,7 @@ int ha_partition::open(const char *name, int mode, uint test_if_locked)
m_open_test_lock
=
test_if_locked
;
m_part_field_array
=
m_part_info
->
full_part_field_array
;
if
(
get_from_handler_file
(
name
,
&
table
->
mem_root
,
test
(
m_is_clone_of
)))
DBUG_RETURN
(
1
);
DBUG_RETURN
(
error
);
name_buffer_ptr
=
m_name_buffer_ptr
;
m_start_key
.
length
=
0
;
m_rec0
=
table
->
record
[
0
];
...
...
@@ -2612,7 +2612,7 @@ int ha_partition::open(const char *name, int mode, uint test_if_locked)
{
if
(
!
(
m_ordered_rec_buffer
=
(
uchar
*
)
my_malloc
(
alloc_len
,
MYF
(
MY_WME
))))
{
DBUG_RETURN
(
1
);
DBUG_RETURN
(
error
);
}
{
/*
...
...
@@ -2635,7 +2635,7 @@ int ha_partition::open(const char *name, int mode, uint test_if_locked)
/* Initialize the bitmap we use to minimize ha_start_bulk_insert calls */
if
(
bitmap_init
(
&
m_bulk_insert_started
,
NULL
,
m_tot_parts
+
1
,
FALSE
))
DBUG_RETURN
(
1
);
DBUG_RETURN
(
error
);
bitmap_clear_all
(
&
m_bulk_insert_started
);
/* Initialize the bitmap we use to determine what partitions are used */
if
(
!
m_is_clone_of
)
...
...
@@ -2644,7 +2644,7 @@ int ha_partition::open(const char *name, int mode, uint test_if_locked)
if
(
bitmap_init
(
&
(
m_part_info
->
used_partitions
),
NULL
,
m_tot_parts
,
TRUE
))
{
bitmap_free
(
&
m_bulk_insert_started
);
DBUG_RETURN
(
1
);
DBUG_RETURN
(
error
);
}
bitmap_set_all
(
&
(
m_part_info
->
used_partitions
));
}
...
...
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