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
063a34b6
Commit
063a34b6
authored
Sep 07, 2010
by
Mattias Jonsson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug#55458: Partitioned MyISAM table gets crashed by multi-table update
Updated according to reviewers comments.
parent
5bde03c8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
12 deletions
+30
-12
sql/ha_partition.cc
sql/ha_partition.cc
+28
-12
sql/ha_partition.h
sql/ha_partition.h
+2
-0
No files found.
sql/ha_partition.cc
View file @
063a34b6
...
@@ -233,6 +233,7 @@ void ha_partition::init_handler_variables()
...
@@ -233,6 +233,7 @@ void ha_partition::init_handler_variables()
m_extra_cache
=
FALSE
;
m_extra_cache
=
FALSE
;
m_extra_cache_size
=
0
;
m_extra_cache_size
=
0
;
m_extra_prepare_for_update
=
FALSE
;
m_extra_prepare_for_update
=
FALSE
;
m_extra_cache_part_id
=
NO_CURRENT_PART_ID
;
m_handler_status
=
handler_not_initialized
;
m_handler_status
=
handler_not_initialized
;
m_low_byte_first
=
1
;
m_low_byte_first
=
1
;
m_part_field_array
=
NULL
;
m_part_field_array
=
NULL
;
...
@@ -5376,9 +5377,6 @@ void ha_partition::get_dynamic_partition_info(PARTITION_INFO *stat_info,
...
@@ -5376,9 +5377,6 @@ void ha_partition::get_dynamic_partition_info(PARTITION_INFO *stat_info,
when performing the sequential scan we will check this recorded value
when performing the sequential scan we will check this recorded value
and call extra_opt whenever we start scanning a new partition.
and call extra_opt whenever we start scanning a new partition.
monty: Neads to be fixed so that it's passed to all handlers when we
move to another partition during table scan.
HA_EXTRA_NO_CACHE:
HA_EXTRA_NO_CACHE:
When performing a UNION SELECT HA_EXTRA_NO_CACHE is called from the
When performing a UNION SELECT HA_EXTRA_NO_CACHE is called from the
flush method in the select_union class.
flush method in the select_union class.
...
@@ -5390,7 +5388,7 @@ void ha_partition::get_dynamic_partition_info(PARTITION_INFO *stat_info,
...
@@ -5390,7 +5388,7 @@ void ha_partition::get_dynamic_partition_info(PARTITION_INFO *stat_info,
for. If no cache is in use they will quickly return after finding
for. If no cache is in use they will quickly return after finding
this out. And we also ensure that all caches are disabled and no one
this out. And we also ensure that all caches are disabled and no one
is left by mistake.
is left by mistake.
In the future this call will probably be deleted an we will instead call
In the future this call will probably be deleted an
d
we will instead call
::reset();
::reset();
HA_EXTRA_WRITE_CACHE:
HA_EXTRA_WRITE_CACHE:
...
@@ -5402,8 +5400,9 @@ void ha_partition::get_dynamic_partition_info(PARTITION_INFO *stat_info,
...
@@ -5402,8 +5400,9 @@ void ha_partition::get_dynamic_partition_info(PARTITION_INFO *stat_info,
This is called as part of a multi-table update. When the table to be
This is called as part of a multi-table update. When the table to be
updated is also scanned then this informs MyISAM handler to drop any
updated is also scanned then this informs MyISAM handler to drop any
caches if dynamic records are used (fixed size records do not care
caches if dynamic records are used (fixed size records do not care
about this call). We pass this along to all underlying MyISAM handlers
about this call). We pass this along to the first partition to scan, and
and ignore it for the rest.
flag that it is to be called after HA_EXTRA_CACHE when moving to the next
partition to scan.
HA_EXTRA_PREPARE_FOR_DROP:
HA_EXTRA_PREPARE_FOR_DROP:
Only used by MyISAM, called in preparation for a DROP TABLE.
Only used by MyISAM, called in preparation for a DROP TABLE.
...
@@ -5559,6 +5558,7 @@ int ha_partition::extra(enum ha_extra_function operation)
...
@@ -5559,6 +5558,7 @@ int ha_partition::extra(enum ha_extra_function operation)
m_extra_prepare_for_update
=
TRUE
;
m_extra_prepare_for_update
=
TRUE
;
if
(
m_part_spec
.
start_part
!=
NO_CURRENT_PART_ID
)
if
(
m_part_spec
.
start_part
!=
NO_CURRENT_PART_ID
)
{
{
DBUG_ASSERT
(
m_extra_cache_part_id
==
m_part_spec
.
start_part
);
VOID
(
m_file
[
m_part_spec
.
start_part
]
->
extra
(
HA_EXTRA_PREPARE_FOR_UPDATE
));
VOID
(
m_file
[
m_part_spec
.
start_part
]
->
extra
(
HA_EXTRA_PREPARE_FOR_UPDATE
));
}
}
break
;
break
;
...
@@ -5586,11 +5586,22 @@ int ha_partition::extra(enum ha_extra_function operation)
...
@@ -5586,11 +5586,22 @@ int ha_partition::extra(enum ha_extra_function operation)
break
;
break
;
}
}
case
HA_EXTRA_NO_CACHE
:
case
HA_EXTRA_NO_CACHE
:
{
int
ret
=
0
;
if
(
m_extra_cache_part_id
!=
NO_CURRENT_PART_ID
)
ret
=
m_file
[
m_extra_cache_part_id
]
->
extra
(
HA_EXTRA_NO_CACHE
);
m_extra_cache
=
FALSE
;
m_extra_cache_size
=
0
;
m_extra_prepare_for_update
=
FALSE
;
m_extra_cache_part_id
=
NO_CURRENT_PART_ID
;
DBUG_RETURN
(
ret
);
}
case
HA_EXTRA_WRITE_CACHE
:
case
HA_EXTRA_WRITE_CACHE
:
{
{
m_extra_cache
=
FALSE
;
m_extra_cache
=
FALSE
;
m_extra_cache_size
=
0
;
m_extra_cache_size
=
0
;
m_extra_prepare_for_update
=
FALSE
;
m_extra_prepare_for_update
=
FALSE
;
m_extra_cache_part_id
=
NO_CURRENT_PART_ID
;
DBUG_RETURN
(
loop_extra
(
operation
));
DBUG_RETURN
(
loop_extra
(
operation
));
}
}
case
HA_EXTRA_IGNORE_NO_KEY
:
case
HA_EXTRA_IGNORE_NO_KEY
:
...
@@ -5777,17 +5788,19 @@ int ha_partition::loop_extra(enum ha_extra_function operation)
...
@@ -5777,17 +5788,19 @@ int ha_partition::loop_extra(enum ha_extra_function operation)
{
{
int
result
=
0
,
tmp
;
int
result
=
0
,
tmp
;
handler
**
file
;
handler
**
file
;
bool
is_select
;
DBUG_ENTER
(
"ha_partition::loop_extra()"
);
DBUG_ENTER
(
"ha_partition::loop_extra()"
);
/*
is_select
=
(
thd_sql_command
(
ha_thd
())
==
SQLCOM_SELECT
);
TODO, 5.2: this is where you could possibly add optimisations to add the bitmap
_if_ a SELECT.
*/
for
(
file
=
m_file
;
*
file
;
file
++
)
for
(
file
=
m_file
;
*
file
;
file
++
)
{
if
(
!
is_select
||
bitmap_is_set
(
&
(
m_part_info
->
used_partitions
),
file
-
m_file
))
{
{
if
((
tmp
=
(
*
file
)
->
extra
(
operation
)))
if
((
tmp
=
(
*
file
)
->
extra
(
operation
)))
result
=
tmp
;
result
=
tmp
;
}
}
}
DBUG_RETURN
(
result
);
DBUG_RETURN
(
result
);
}
}
...
@@ -5822,6 +5835,7 @@ void ha_partition::late_extra_cache(uint partition_id)
...
@@ -5822,6 +5835,7 @@ void ha_partition::late_extra_cache(uint partition_id)
DBUG_ASSERT
(
m_extra_cache
);
DBUG_ASSERT
(
m_extra_cache
);
VOID
(
file
->
extra
(
HA_EXTRA_PREPARE_FOR_UPDATE
));
VOID
(
file
->
extra
(
HA_EXTRA_PREPARE_FOR_UPDATE
));
}
}
m_extra_cache_part_id
=
partition_id
;
DBUG_VOID_RETURN
;
DBUG_VOID_RETURN
;
}
}
...
@@ -5846,6 +5860,8 @@ void ha_partition::late_extra_no_cache(uint partition_id)
...
@@ -5846,6 +5860,8 @@ void ha_partition::late_extra_no_cache(uint partition_id)
DBUG_VOID_RETURN
;
DBUG_VOID_RETURN
;
file
=
m_file
[
partition_id
];
file
=
m_file
[
partition_id
];
VOID
(
file
->
extra
(
HA_EXTRA_NO_CACHE
));
VOID
(
file
->
extra
(
HA_EXTRA_NO_CACHE
));
DBUG_ASSERT
(
partition_id
==
m_extra_cache_part_id
);
m_extra_cache_part_id
=
NO_CURRENT_PART_ID
;
DBUG_VOID_RETURN
;
DBUG_VOID_RETURN
;
}
}
...
...
sql/ha_partition.h
View file @
063a34b6
...
@@ -156,6 +156,8 @@ class ha_partition :public handler
...
@@ -156,6 +156,8 @@ class ha_partition :public handler
uint
m_extra_cache_size
;
uint
m_extra_cache_size
;
/* The same goes for HA_EXTRA_PREPARE_FOR_UPDATE */
/* The same goes for HA_EXTRA_PREPARE_FOR_UPDATE */
bool
m_extra_prepare_for_update
;
bool
m_extra_prepare_for_update
;
/* Which partition has active cache */
uint
m_extra_cache_part_id
;
void
init_handler_variables
();
void
init_handler_variables
();
/*
/*
...
...
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