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
e8b26150
Commit
e8b26150
authored
Dec 05, 2009
by
He Zhenxing
Browse files
Options
Browse Files
Download
Plain Diff
Merge from trunk-bugfixing
parents
cbafed1c
6a213f3a
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
36 additions
and
11 deletions
+36
-11
mysql-test/r/partition_column.result
mysql-test/r/partition_column.result
+16
-6
mysql-test/t/partition_column.test
mysql-test/t/partition_column.test
+16
-1
plugin/semisync/CMakeLists.txt
plugin/semisync/CMakeLists.txt
+1
-1
plugin/semisync/Makefile.am
plugin/semisync/Makefile.am
+2
-2
sql/partition_info.cc
sql/partition_info.cc
+1
-1
No files found.
mysql-test/r/partition_column.result
View file @
e8b26150
drop table if exists t1;
create table t1 (a int, b int)
partition by range columns (a,b)
( partition p0 values less than (maxvalue, 10),
partition p1 values less than (maxvalue, maxvalue));
ERROR HY000: VALUES LESS THAN value must be strictly increasing for each partition
create table t1 (a int, b int, c int)
partition by range columns (a,b,c)
( partition p0 values less than (1, maxvalue, 10),
partition p1 values less than (1, maxvalue, maxvalue));
ERROR HY000: VALUES LESS THAN value must be strictly increasing for each partition
create table t1 (a varchar(1) character set latin1 collate latin1_general_ci)
partition by range columns(a)
( partition p0 values less than ('a'),
...
...
@@ -89,7 +99,7 @@ subpartition by hash (to_seconds(d))
subpartitions 4
( partition p0 values less than (1, '0', MAXVALUE, '1900-01-01'),
partition p1 values less than (1, 'a', MAXVALUE, '1999-01-01'),
partition p2 values less than (1, '
a
', MAXVALUE, MAXVALUE),
partition p2 values less than (1, '
b
', MAXVALUE, MAXVALUE),
partition p3 values less than (1, MAXVALUE, MAXVALUE, MAXVALUE));
select partition_method, partition_expression, partition_description
from information_schema.partitions where table_name = "t1";
...
...
@@ -102,10 +112,10 @@ RANGE COLUMNS a,b,c,d 1,'a',MAXVALUE,'1999-01-01'
RANGE COLUMNS a,b,c,d 1,'a',MAXVALUE,'1999-01-01'
RANGE COLUMNS a,b,c,d 1,'a',MAXVALUE,'1999-01-01'
RANGE COLUMNS a,b,c,d 1,'a',MAXVALUE,'1999-01-01'
RANGE COLUMNS a,b,c,d 1,'
a
',MAXVALUE,MAXVALUE
RANGE COLUMNS a,b,c,d 1,'
a
',MAXVALUE,MAXVALUE
RANGE COLUMNS a,b,c,d 1,'
a
',MAXVALUE,MAXVALUE
RANGE COLUMNS a,b,c,d 1,'
a
',MAXVALUE,MAXVALUE
RANGE COLUMNS a,b,c,d 1,'
b
',MAXVALUE,MAXVALUE
RANGE COLUMNS a,b,c,d 1,'
b
',MAXVALUE,MAXVALUE
RANGE COLUMNS a,b,c,d 1,'
b
',MAXVALUE,MAXVALUE
RANGE COLUMNS a,b,c,d 1,'
b
',MAXVALUE,MAXVALUE
RANGE COLUMNS a,b,c,d 1,MAXVALUE,MAXVALUE,MAXVALUE
RANGE COLUMNS a,b,c,d 1,MAXVALUE,MAXVALUE,MAXVALUE
RANGE COLUMNS a,b,c,d 1,MAXVALUE,MAXVALUE,MAXVALUE
...
...
@@ -123,7 +133,7 @@ SUBPARTITION BY HASH (to_seconds(d))
SUBPARTITIONS 4
(PARTITION p0 VALUES LESS THAN (1,'0',MAXVALUE,'1900-01-01') ENGINE = MyISAM,
PARTITION p1 VALUES LESS THAN (1,'a',MAXVALUE,'1999-01-01') ENGINE = MyISAM,
PARTITION p2 VALUES LESS THAN (1,'
a
',MAXVALUE,MAXVALUE) ENGINE = MyISAM,
PARTITION p2 VALUES LESS THAN (1,'
b
',MAXVALUE,MAXVALUE) ENGINE = MyISAM,
PARTITION p3 VALUES LESS THAN (1,MAXVALUE,MAXVALUE,MAXVALUE) ENGINE = MyISAM) */
drop table t1;
create table t1 (a int, b int)
...
...
mysql-test/t/partition_column.test
View file @
e8b26150
...
...
@@ -8,6 +8,21 @@
drop
table
if
exists
t1
;
--
enable_warnings
#
# BUG#49180, Possible to define empty intervals for column list partitioning
#
--
error
ER_RANGE_NOT_INCREASING_ERROR
create
table
t1
(
a
int
,
b
int
)
partition
by
range
columns
(
a
,
b
)
(
partition
p0
values
less
than
(
maxvalue
,
10
),
partition
p1
values
less
than
(
maxvalue
,
maxvalue
));
--
error
ER_RANGE_NOT_INCREASING_ERROR
create
table
t1
(
a
int
,
b
int
,
c
int
)
partition
by
range
columns
(
a
,
b
,
c
)
(
partition
p0
values
less
than
(
1
,
maxvalue
,
10
),
partition
p1
values
less
than
(
1
,
maxvalue
,
maxvalue
));
#
# BUG#48161, Delivering too few records using collate syntax with partitions
#
...
...
@@ -78,7 +93,7 @@ subpartition by hash (to_seconds(d))
subpartitions
4
(
partition
p0
values
less
than
(
1
,
'0'
,
MAXVALUE
,
'1900-01-01'
),
partition
p1
values
less
than
(
1
,
'a'
,
MAXVALUE
,
'1999-01-01'
),
partition
p2
values
less
than
(
1
,
'
a
'
,
MAXVALUE
,
MAXVALUE
),
partition
p2
values
less
than
(
1
,
'
b
'
,
MAXVALUE
,
MAXVALUE
),
partition
p3
values
less
than
(
1
,
MAXVALUE
,
MAXVALUE
,
MAXVALUE
));
select
partition_method
,
partition_expression
,
partition_description
from
information_schema
.
partitions
where
table_name
=
"t1"
;
...
...
plugin/semisync/CMakeLists.txt
View file @
e8b26150
...
...
@@ -29,7 +29,7 @@ SET(SEMISYNC_SLAVE_SOURCES semisync.cc semisync_slave.cc semisync_slave_plugin.c
ADD_DEFINITIONS
(
-DMYSQL_DYNAMIC_PLUGIN
)
ADD_LIBRARY
(
semisync_master SHARED
${
SEMISYNC_MASTER_SOURCES
}
)
TARGET_LINK_LIBRARIES
(
semisync_master mysqld
)
TARGET_LINK_LIBRARIES
(
semisync_master mysql
services mysql
d
)
ADD_LIBRARY
(
semisync_slave SHARED
${
SEMISYNC_SLAVE_SOURCES
}
)
TARGET_LINK_LIBRARIES
(
semisync_slave mysqld
)
MESSAGE
(
"build SEMISYNC as DLL"
)
plugin/semisync/Makefile.am
View file @
e8b26150
...
...
@@ -25,12 +25,12 @@ noinst_HEADERS = semisync.h semisync_master.h semisync_slave.h
pkgplugin_LTLIBRARIES
=
semisync_master.la semisync_slave.la
semisync_master_la_LDFLAGS
=
-module
semisync_master_la_LDFLAGS
=
-module
-rpath
$(pkgplugindir)
-L
$(top_builddir)
/libservices
-lmysqlservices
semisync_master_la_CXXFLAGS
=
$(AM_CFLAGS)
-DMYSQL_DYNAMIC_PLUGIN
semisync_master_la_CFLAGS
=
$(AM_CFLAGS)
-DMYSQL_DYNAMIC_PLUGIN
semisync_master_la_SOURCES
=
semisync.cc semisync_master.cc semisync_master_plugin.cc
semisync_slave_la_LDFLAGS
=
-module
semisync_slave_la_LDFLAGS
=
-module
-rpath
$(pkgplugindir)
-L
$(top_builddir)
/libservices
-lmysqlservices
semisync_slave_la_CXXFLAGS
=
$(AM_CFLAGS)
-DMYSQL_DYNAMIC_PLUGIN
semisync_slave_la_CFLAGS
=
$(AM_CFLAGS)
-DMYSQL_DYNAMIC_PLUGIN
semisync_slave_la_SOURCES
=
semisync.cc semisync_slave.cc semisync_slave_plugin.cc
...
...
sql/partition_info.cc
View file @
e8b26150
...
...
@@ -801,7 +801,7 @@ int partition_info::compare_column_values(const void *first_arg,
if
(
first
->
max_value
||
second
->
max_value
)
{
if
(
first
->
max_value
&&
second
->
max_value
)
continue
;
return
0
;
if
(
second
->
max_value
)
return
-
1
;
else
...
...
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