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
9b333dd3
Commit
9b333dd3
authored
18 years ago
by
jimw@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/jimw/my/mysql-5.1-16782
into mysql.com:/home/jimw/my/mysql-5.1-clean
parents
246a2a7f
e145908e
Branches unavailable
Tags unavailable
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
3 deletions
+16
-3
mysql-test/r/partition.result
mysql-test/r/partition.result
+4
-0
mysql-test/t/partition.test
mysql-test/t/partition.test
+8
-0
sql/ha_partition.cc
sql/ha_partition.cc
+4
-3
No files found.
mysql-test/r/partition.result
View file @
9b333dd3
...
@@ -306,5 +306,9 @@ partition by range (f_int1) subpartition by hash (f_int1)
...
@@ -306,5 +306,9 @@ partition by range (f_int1) subpartition by hash (f_int1)
(partition part1 values less than (1000)
(partition part1 values less than (1000)
(subpartition subpart11 engine = memory));
(subpartition subpart11 engine = memory));
set session storage_engine='myisam';
set session storage_engine='myisam';
create table t1 (f_int1 integer, f_int2 integer, primary key (f_int1))
partition by hash(f_int1) partitions 2;
insert into t1 values (1,1),(2,2);
replace into t1 values (1,1),(2,2);
drop table t1;
drop table t1;
End of 5.1 tests
End of 5.1 tests
This diff is collapsed.
Click to expand it.
mysql-test/t/partition.test
View file @
9b333dd3
...
@@ -390,6 +390,14 @@ create table t1 (f_int1 int(11) default null) engine = memory
...
@@ -390,6 +390,14 @@ create table t1 (f_int1 int(11) default null) engine = memory
(
partition
part1
values
less
than
(
1000
)
(
partition
part1
values
less
than
(
1000
)
(
subpartition
subpart11
engine
=
memory
));
(
subpartition
subpart11
engine
=
memory
));
set
session
storage_engine
=
'myisam'
;
set
session
storage_engine
=
'myisam'
;
#
# Bug #16782: Crash using REPLACE on table with primary key
#
create
table
t1
(
f_int1
integer
,
f_int2
integer
,
primary
key
(
f_int1
))
partition
by
hash
(
f_int1
)
partitions
2
;
insert
into
t1
values
(
1
,
1
),(
2
,
2
);
replace
into
t1
values
(
1
,
1
),(
2
,
2
);
drop
table
t1
;
drop
table
t1
;
--
echo
End
of
5.1
tests
--
echo
End
of
5.1
tests
This diff is collapsed.
Click to expand it.
sql/ha_partition.cc
View file @
9b333dd3
...
@@ -360,7 +360,7 @@ int ha_partition::ha_initialise()
...
@@ -360,7 +360,7 @@ int ha_partition::ha_initialise()
other parameters are calculated on demand.
other parameters are calculated on demand.
HA_FILE_BASED is always set for partition handler since we use a
HA_FILE_BASED is always set for partition handler since we use a
special file for handling names of partitions, engine types.
special file for handling names of partitions, engine types.
HA_CAN_GEOMETRY, HA_CAN_FULLTEXT, HA_CAN_SQL_HANDLER,
HA_CAN_GEOMETRY, HA_CAN_FULLTEXT, HA_CAN_SQL_HANDLER,
HA_DUPP_POS,
HA_CAN_INSERT_DELAYED is disabled until further investigated.
HA_CAN_INSERT_DELAYED is disabled until further investigated.
*/
*/
m_table_flags
=
m_file
[
0
]
->
table_flags
();
m_table_flags
=
m_file
[
0
]
->
table_flags
();
...
@@ -383,8 +383,8 @@ int ha_partition::ha_initialise()
...
@@ -383,8 +383,8 @@ int ha_partition::ha_initialise()
m_pkey_is_clustered
=
FALSE
;
m_pkey_is_clustered
=
FALSE
;
m_table_flags
&=
file
->
table_flags
();
m_table_flags
&=
file
->
table_flags
();
}
while
(
*
(
++
file_array
));
}
while
(
*
(
++
file_array
));
m_table_flags
&=
~
(
HA_CAN_GEOMETRY
&
HA_CAN_FULLTEXT
&
m_table_flags
&=
~
(
HA_CAN_GEOMETRY
|
HA_CAN_FULLTEXT
|
HA_DUPP_POS
|
HA_CAN_SQL_HANDLER
&
HA_CAN_INSERT_DELAYED
);
HA_CAN_SQL_HANDLER
|
HA_CAN_INSERT_DELAYED
);
m_table_flags
|=
HA_FILE_BASED
|
HA_REC_NOT_IN_SEQ
;
m_table_flags
|=
HA_FILE_BASED
|
HA_REC_NOT_IN_SEQ
;
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
}
}
...
@@ -4684,6 +4684,7 @@ int ha_partition::extra(enum ha_extra_function operation)
...
@@ -4684,6 +4684,7 @@ int ha_partition::extra(enum ha_extra_function operation)
case
HA_EXTRA_PREPARE_FOR_UPDATE
:
case
HA_EXTRA_PREPARE_FOR_UPDATE
:
case
HA_EXTRA_PREPARE_FOR_DELETE
:
case
HA_EXTRA_PREPARE_FOR_DELETE
:
case
HA_EXTRA_FORCE_REOPEN
:
case
HA_EXTRA_FORCE_REOPEN
:
case
HA_EXTRA_FLUSH_CACHE
:
{
{
if
(
m_myisam
)
if
(
m_myisam
)
DBUG_RETURN
(
loop_extra
(
operation
));
DBUG_RETURN
(
loop_extra
(
operation
));
...
...
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