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
a30b3b43
Commit
a30b3b43
authored
Sep 10, 2010
by
Mattias Jonsson
Browse files
Options
Browse Files
Download
Plain Diff
merge
parents
4770f8d4
063a34b6
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
108 additions
and
15 deletions
+108
-15
mysql-test/r/partition.result
mysql-test/r/partition.result
+25
-0
mysql-test/t/partition.test
mysql-test/t/partition.test
+27
-0
sql/ha_partition.cc
sql/ha_partition.cc
+52
-15
sql/ha_partition.h
sql/ha_partition.h
+4
-0
No files found.
mysql-test/r/partition.result
View file @
a30b3b43
drop table if exists t1, t2;
drop table if exists t1, t2;
#
# Bug#55458: Partitioned MyISAM table gets crashed by multi-table update
#
CREATE TABLE t1 (
`id` int NOT NULL,
`user_num` int DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=MyISAM CHARSET=latin1;
INSERT INTO t1 VALUES (1,8601);
INSERT INTO t1 VALUES (2,8601);
INSERT INTO t1 VALUES (3,8601);
INSERT INTO t1 VALUES (4,8601);
CREATE TABLE t2 (
`id` int(11) NOT NULL,
`user_num` int DEFAULT NULL,
`name` varchar(64) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=MyISAM CHARSET=latin1
PARTITION BY HASH (id)
PARTITIONS 2;
INSERT INTO t2 VALUES (1,8601,'John');
INSERT INTO t2 VALUES (2,8601,'JS');
INSERT INTO t2 VALUES (3,8601,'John S');
UPDATE t1, t2 SET t2.name = 'John Smith' WHERE t1.user_num = t2.user_num;
DROP TABLE t1, t2;
CREATE TABLE t1 (a INT, b INT)
CREATE TABLE t1 (a INT, b INT)
PARTITION BY LIST (a)
PARTITION BY LIST (a)
SUBPARTITION BY HASH (b)
SUBPARTITION BY HASH (b)
...
...
mysql-test/t/partition.test
View file @
a30b3b43
...
@@ -14,6 +14,33 @@
...
@@ -14,6 +14,33 @@
drop
table
if
exists
t1
,
t2
;
drop
table
if
exists
t1
,
t2
;
--
enable_warnings
--
enable_warnings
--
echo
#
--
echo
# Bug#55458: Partitioned MyISAM table gets crashed by multi-table update
--
echo
#
CREATE
TABLE
t1
(
`id`
int
NOT
NULL
,
`user_num`
int
DEFAULT
NULL
,
PRIMARY
KEY
(
`id`
)
)
ENGINE
=
MyISAM
CHARSET
=
latin1
;
INSERT
INTO
t1
VALUES
(
1
,
8601
);
INSERT
INTO
t1
VALUES
(
2
,
8601
);
INSERT
INTO
t1
VALUES
(
3
,
8601
);
INSERT
INTO
t1
VALUES
(
4
,
8601
);
CREATE
TABLE
t2
(
`id`
int
(
11
)
NOT
NULL
,
`user_num`
int
DEFAULT
NULL
,
`name`
varchar
(
64
)
NOT
NULL
,
PRIMARY
KEY
(
`id`
)
)
ENGINE
=
MyISAM
CHARSET
=
latin1
PARTITION
BY
HASH
(
id
)
PARTITIONS
2
;
INSERT
INTO
t2
VALUES
(
1
,
8601
,
'John'
);
INSERT
INTO
t2
VALUES
(
2
,
8601
,
'JS'
);
INSERT
INTO
t2
VALUES
(
3
,
8601
,
'John S'
);
UPDATE
t1
,
t2
SET
t2
.
name
=
'John Smith'
WHERE
t1
.
user_num
=
t2
.
user_num
;
DROP
TABLE
t1
,
t2
;
#
#
# Bug#48276: can't add column if subpartition exists
# Bug#48276: can't add column if subpartition exists
CREATE
TABLE
t1
(
a
INT
,
b
INT
)
CREATE
TABLE
t1
(
a
INT
,
b
INT
)
...
...
sql/ha_partition.cc
View file @
a30b3b43
...
@@ -232,6 +232,8 @@ void ha_partition::init_handler_variables()
...
@@ -232,6 +232,8 @@ void ha_partition::init_handler_variables()
m_innodb
=
FALSE
;
m_innodb
=
FALSE
;
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_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
;
...
@@ -5380,9 +5382,6 @@ void ha_partition::get_dynamic_partition_info(PARTITION_INFO *stat_info,
...
@@ -5380,9 +5382,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.
...
@@ -5394,7 +5393,7 @@ void ha_partition::get_dynamic_partition_info(PARTITION_INFO *stat_info,
...
@@ -5394,7 +5393,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:
...
@@ -5406,8 +5405,9 @@ void ha_partition::get_dynamic_partition_info(PARTITION_INFO *stat_info,
...
@@ -5406,8 +5405,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.
...
@@ -5554,9 +5554,21 @@ int ha_partition::extra(enum ha_extra_function operation)
...
@@ -5554,9 +5554,21 @@ int ha_partition::extra(enum ha_extra_function operation)
case
HA_EXTRA_PREPARE_FOR_RENAME
:
case
HA_EXTRA_PREPARE_FOR_RENAME
:
DBUG_RETURN
(
prepare_for_rename
());
DBUG_RETURN
(
prepare_for_rename
());
break
;
break
;
case
HA_EXTRA_PREPARE_FOR_UPDATE
:
DBUG_ASSERT
(
m_extra_cache
);
/*
Needs to be run on the first partition in the range now, and
later in late_extra_cache, when switching to a new partition to scan.
*/
m_extra_prepare_for_update
=
TRUE
;
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
));
}
break
;
case
HA_EXTRA_NORMAL
:
case
HA_EXTRA_NORMAL
:
case
HA_EXTRA_QUICK
:
case
HA_EXTRA_QUICK
:
case
HA_EXTRA_PREPARE_FOR_UPDATE
:
case
HA_EXTRA_FORCE_REOPEN
:
case
HA_EXTRA_FORCE_REOPEN
:
case
HA_EXTRA_PREPARE_FOR_DROP
:
case
HA_EXTRA_PREPARE_FOR_DROP
:
case
HA_EXTRA_FLUSH_CACHE
:
case
HA_EXTRA_FLUSH_CACHE
:
...
@@ -5579,10 +5591,22 @@ int ha_partition::extra(enum ha_extra_function operation)
...
@@ -5579,10 +5591,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_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
:
...
@@ -5710,6 +5734,7 @@ int ha_partition::extra_opt(enum ha_extra_function operation, ulong cachesize)
...
@@ -5710,6 +5734,7 @@ int ha_partition::extra_opt(enum ha_extra_function operation, ulong cachesize)
void
ha_partition
::
prepare_extra_cache
(
uint
cachesize
)
void
ha_partition
::
prepare_extra_cache
(
uint
cachesize
)
{
{
DBUG_ENTER
(
"ha_partition::prepare_extra_cache()"
);
DBUG_ENTER
(
"ha_partition::prepare_extra_cache()"
);
DBUG_PRINT
(
"info"
,
(
"cachesize %u"
,
cachesize
));
m_extra_cache
=
TRUE
;
m_extra_cache
=
TRUE
;
m_extra_cache_size
=
cachesize
;
m_extra_cache_size
=
cachesize
;
...
@@ -5768,17 +5793,19 @@ int ha_partition::loop_extra(enum ha_extra_function operation)
...
@@ -5768,17 +5793,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
);
}
}
...
@@ -5798,14 +5825,22 @@ void ha_partition::late_extra_cache(uint partition_id)
...
@@ -5798,14 +5825,22 @@ void ha_partition::late_extra_cache(uint partition_id)
{
{
handler
*
file
;
handler
*
file
;
DBUG_ENTER
(
"ha_partition::late_extra_cache"
);
DBUG_ENTER
(
"ha_partition::late_extra_cache"
);
DBUG_PRINT
(
"info"
,
(
"extra_cache %u partid %u size %u"
,
m_extra_cache
,
partition_id
,
m_extra_cache_size
));
if
(
!
m_extra_cache
)
if
(
!
m_extra_cache
&&
!
m_extra_prepare_for_update
)
DBUG_VOID_RETURN
;
DBUG_VOID_RETURN
;
file
=
m_file
[
partition_id
];
file
=
m_file
[
partition_id
];
if
(
m_extra_cache_size
==
0
)
if
(
m_extra_cache_size
==
0
)
VOID
(
file
->
extra
(
HA_EXTRA_CACHE
));
VOID
(
file
->
extra
(
HA_EXTRA_CACHE
));
else
else
VOID
(
file
->
extra_opt
(
HA_EXTRA_CACHE
,
m_extra_cache_size
));
VOID
(
file
->
extra_opt
(
HA_EXTRA_CACHE
,
m_extra_cache_size
));
if
(
m_extra_prepare_for_update
)
{
DBUG_ASSERT
(
m_extra_cache
);
VOID
(
file
->
extra
(
HA_EXTRA_PREPARE_FOR_UPDATE
));
}
m_extra_cache_part_id
=
partition_id
;
DBUG_VOID_RETURN
;
DBUG_VOID_RETURN
;
}
}
...
@@ -5826,10 +5861,12 @@ void ha_partition::late_extra_no_cache(uint partition_id)
...
@@ -5826,10 +5861,12 @@ void ha_partition::late_extra_no_cache(uint partition_id)
handler
*
file
;
handler
*
file
;
DBUG_ENTER
(
"ha_partition::late_extra_no_cache"
);
DBUG_ENTER
(
"ha_partition::late_extra_no_cache"
);
if
(
!
m_extra_cache
)
if
(
!
m_extra_cache
&&
!
m_extra_prepare_for_update
)
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 @
a30b3b43
...
@@ -154,6 +154,10 @@ class ha_partition :public handler
...
@@ -154,6 +154,10 @@ class ha_partition :public handler
*/
*/
bool
m_extra_cache
;
bool
m_extra_cache
;
uint
m_extra_cache_size
;
uint
m_extra_cache_size
;
/* The same goes for HA_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