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
e84b4600
Commit
e84b4600
authored
Jan 10, 2007
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into mysql.com:/home/hf/work/mysql-5.1-mrg
parents
2afe42d3
cc13bfc6
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
55 additions
and
1 deletion
+55
-1
mysql-test/r/partition.result
mysql-test/r/partition.result
+10
-0
mysql-test/r/partition_federated.result
mysql-test/r/partition_federated.result
+6
-0
mysql-test/t/partition.test
mysql-test/t/partition.test
+16
-0
mysql-test/t/partition_federated.test
mysql-test/t/partition_federated.test
+21
-0
sql/sql_partition.cc
sql/sql_partition.cc
+1
-0
storage/federated/ha_federated.cc
storage/federated/ha_federated.cc
+1
-1
No files found.
mysql-test/r/partition.result
View file @
e84b4600
...
...
@@ -1128,4 +1128,14 @@ a
18446744073709551613
18446744073709551614
drop table t1;
CREATE TABLE t1 (
num int(11) NOT NULL, cs int(11) NOT NULL)
PARTITION BY RANGE (num) SUBPARTITION BY HASH (
cs) SUBPARTITIONS 2 (PARTITION p_X VALUES LESS THAN MAXVALUE);
ALTER TABLE t1
REORGANIZE PARTITION p_X INTO (
PARTITION p_100 VALUES LESS THAN (100),
PARTITION p_X VALUES LESS THAN MAXVALUE
);
drop table t1;
End of 5.1 tests
mysql-test/r/partition_federated.result
0 → 100644
View file @
e84b4600
drop table if exists t1;
create table t1 (s1 int) engine=federated
connection='mysql://root@localhost/federated/t1' partition by list (s1)
(partition p1 values in (1), partition p2 values in (2));
ERROR HY000: Engine cannot be used in partitioned tables
End of 5.1 tests
mysql-test/t/partition.test
View file @
e84b4600
...
...
@@ -1354,4 +1354,20 @@ delete from t1 where a = 18446744073709551615;
select
*
from
t1
;
drop
table
t1
;
#
# Bug 24502 reorganize partition closes connection
#
CREATE
TABLE
t1
(
num
int
(
11
)
NOT
NULL
,
cs
int
(
11
)
NOT
NULL
)
PARTITION
BY
RANGE
(
num
)
SUBPARTITION
BY
HASH
(
cs
)
SUBPARTITIONS
2
(
PARTITION
p_X
VALUES
LESS
THAN
MAXVALUE
);
ALTER
TABLE
t1
REORGANIZE
PARTITION
p_X
INTO
(
PARTITION
p_100
VALUES
LESS
THAN
(
100
),
PARTITION
p_X
VALUES
LESS
THAN
MAXVALUE
);
drop
table
t1
;
--
echo
End
of
5.1
tests
mysql-test/t/partition_federated.test
0 → 100644
View file @
e84b4600
#
# Tests for partitioned FEDERATED
#
--
source
include
/
have_partition
.
inc
--
source
include
/
not_embedded
.
inc
--
source
include
/
have_federated_db
.
inc
--
disable_warnings
drop
table
if
exists
t1
;
--
enable_warnings
#
# Bug #22451 Partitions: duplicate results with engine=federated
#
--
error
ER_PARTITION_MERGE_ERROR
create
table
t1
(
s1
int
)
engine
=
federated
connection
=
'mysql://root@localhost/federated/t1'
partition
by
list
(
s1
)
(
partition
p1
values
in
(
1
),
partition
p2
values
in
(
2
));
--
echo
End
of
5.1
tests
sql/sql_partition.cc
View file @
e84b4600
...
...
@@ -4738,6 +4738,7 @@ state of p1.
}
alt_part_info
->
part_type
=
tab_part_info
->
part_type
;
alt_part_info
->
subpart_type
=
tab_part_info
->
subpart_type
;
alt_part_info
->
no_subparts
=
tab_part_info
->
no_subparts
;
DBUG_ASSERT
(
!
alt_part_info
->
use_default_partitions
);
if
(
alt_part_info
->
set_up_defaults_for_partitioning
(
table
->
file
,
ULL
(
0
),
...
...
storage/federated/ha_federated.cc
View file @
e84b4600
...
...
@@ -405,7 +405,7 @@ int federated_db_init(void *p)
federated_hton
->
commit
=
federated_commit
;
federated_hton
->
rollback
=
federated_rollback
;
federated_hton
->
create
=
federated_create_handler
;
federated_hton
->
flags
=
HTON_ALTER_NOT_SUPPORTED
;
federated_hton
->
flags
=
HTON_ALTER_NOT_SUPPORTED
|
HTON_NO_PARTITION
;
if
(
pthread_mutex_init
(
&
federated_mutex
,
MY_MUTEX_INIT_FAST
))
goto
error
;
...
...
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