database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-13089 identifier quoting in partitioning

Browse Source 
don't print partitioning expression as it was entered by the user,
use Item::print() according to the sql_mode and sql_quote_show_create
This commit is contained in:
Sergei Golubchik
2017-06-27 20:46:45 +02:00
parent 504eff0ca1
commit 785e2248bd
140 changed files with 12910 additions and 12831 deletions
Download Patch File Download Diff File Expand all files Collapse all files

156
mysql-test/r/partition_default.result
View File

@ -22,10 +22,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
PARTITION BY LIST (a)
(PARTITION p2 VALUES IN (4,5,6) ENGINE = MyISAM,
PARTITION p1 VALUES IN (1) ENGINE = MyISAM,
PARTITION p0 DEFAULT ENGINE = MyISAM)
PARTITION BY LIST (`a`)
(PARTITION `p2` VALUES IN (4,5,6) ENGINE = MyISAM,
PARTITION `p1` VALUES IN (1) ENGINE = MyISAM,
PARTITION `p0` DEFAULT ENGINE = MyISAM)
insert into t1 values (10,10);
insert into t1 values (4,4);
select * from t1;
@ -72,10 +72,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
PARTITION BY LIST (a)
(PARTITION p0 DEFAULT ENGINE = MyISAM,
PARTITION p2 VALUES IN (4,5,6) ENGINE = MyISAM,
PARTITION p1 VALUES IN (1) ENGINE = MyISAM)
PARTITION BY LIST (`a`)
(PARTITION `p0` DEFAULT ENGINE = MyISAM,
PARTITION `p2` VALUES IN (4,5,6) ENGINE = MyISAM,
PARTITION `p1` VALUES IN (1) ENGINE = MyISAM)
insert into t1 values (10,10);
select * from t1;
a b
@ -100,10 +100,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
PARTITION BY LIST (a)
(PARTITION p0 DEFAULT ENGINE = MyISAM,
PARTITION p2 VALUES IN (4,5,6) ENGINE = MyISAM,
PARTITION p1 VALUES IN (1,0) ENGINE = MyISAM)
PARTITION BY LIST (`a`)
(PARTITION `p0` DEFAULT ENGINE = MyISAM,
PARTITION `p2` VALUES IN (4,5,6) ENGINE = MyISAM,
PARTITION `p1` VALUES IN (1,0) ENGINE = MyISAM)
insert into t1 values (10,10);
select * from t1;
a b
@ -128,10 +128,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
PARTITION BY LIST COLUMNS(a,b)
(PARTITION p2 VALUES IN ((1,4),(2,5),(3,6)) ENGINE = MyISAM,
PARTITION p1 VALUES IN ((1,1),(0,0)) ENGINE = MyISAM,
PARTITION p0 DEFAULT ENGINE = MyISAM)
PARTITION BY LIST COLUMNS(`a`,`b`)
(PARTITION `p2` VALUES IN ((1,4),(2,5),(3,6)) ENGINE = MyISAM,
PARTITION `p1` VALUES IN ((1,1),(0,0)) ENGINE = MyISAM,
PARTITION `p0` DEFAULT ENGINE = MyISAM)
insert into t1 values (10,10);
select * from t1;
a b
@ -176,10 +176,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
PARTITION BY LIST (a)
(PARTITION p2 VALUES IN (4,5,6) ENGINE = MyISAM,
PARTITION p1 VALUES IN (1,20) ENGINE = MyISAM,
PARTITION p0 DEFAULT ENGINE = MyISAM)
PARTITION BY LIST (`a`)
(PARTITION `p2` VALUES IN (4,5,6) ENGINE = MyISAM,
PARTITION `p1` VALUES IN (1,20) ENGINE = MyISAM,
PARTITION `p0` DEFAULT ENGINE = MyISAM)
insert into t1 values (10,10);
select partition_name, table_rows from INFORMATION_SCHEMA.PARTITIONS where table_name='t1';
partition_name table_rows
@ -256,10 +256,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
PARTITION BY LIST COLUMNS(a,b)
(PARTITION p2 VALUES IN ((1,4),(2,5),(3,6),(5,5)) ENGINE = MyISAM,
PARTITION p1 VALUES IN ((1,1),(20,20)) ENGINE = MyISAM,
PARTITION p0 DEFAULT ENGINE = MyISAM)
PARTITION BY LIST COLUMNS(`a`,`b`)
(PARTITION `p2` VALUES IN ((1,4),(2,5),(3,6),(5,5)) ENGINE = MyISAM,
PARTITION `p1` VALUES IN ((1,1),(20,20)) ENGINE = MyISAM,
PARTITION `p0` DEFAULT ENGINE = MyISAM)
insert into t1 values (10,10);
select partition_name, table_rows from INFORMATION_SCHEMA.PARTITIONS where table_name='t1';
partition_name table_rows
@ -325,10 +325,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
PARTITION BY LIST (a+b)
(PARTITION p2 VALUES IN (1,2,3,7) ENGINE = MyISAM,
PARTITION p1 VALUES IN (21,0) ENGINE = MyISAM,
PARTITION p0 DEFAULT ENGINE = MyISAM)
PARTITION BY LIST (`a` + `b`)
(PARTITION `p2` VALUES IN (1,2,3,7) ENGINE = MyISAM,
PARTITION `p1` VALUES IN (21,0) ENGINE = MyISAM,
PARTITION `p0` DEFAULT ENGINE = MyISAM)
select * from t1;
a b
2 5
@ -362,10 +362,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
PARTITION BY LIST (a+5)
(PARTITION p2 VALUES IN (1,2,3,7) ENGINE = MyISAM,
PARTITION p1 VALUES IN (0) ENGINE = MyISAM,
PARTITION p0 DEFAULT ENGINE = MyISAM)
PARTITION BY LIST (`a` + 5)
(PARTITION `p2` VALUES IN (1,2,3,7) ENGINE = MyISAM,
PARTITION `p1` VALUES IN (0) ENGINE = MyISAM,
PARTITION `p0` DEFAULT ENGINE = MyISAM)
select * from t1;
a b
2 5
@ -832,10 +832,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
PARTITION BY LIST (a)
(PARTITION p2 VALUES IN (1,2,3) ENGINE = MyISAM,
PARTITION p1 VALUES IN (20,0) ENGINE = MyISAM,
PARTITION p0 DEFAULT ENGINE = MyISAM)
PARTITION BY LIST (`a`)
(PARTITION `p2` VALUES IN (1,2,3) ENGINE = MyISAM,
PARTITION `p1` VALUES IN (20,0) ENGINE = MyISAM,
PARTITION `p0` DEFAULT ENGINE = MyISAM)
select * from t1;
a b
2 5
@ -866,10 +866,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
PARTITION BY LIST (a)
(PARTITION p2 VALUES IN (1,2,3) ENGINE = MyISAM,
PARTITION p1 VALUES IN (20,0) ENGINE = MyISAM,
PARTITION p0 VALUES IN (10) ENGINE = MyISAM)
PARTITION BY LIST (`a`)
(PARTITION `p2` VALUES IN (1,2,3) ENGINE = MyISAM,
PARTITION `p1` VALUES IN (20,0) ENGINE = MyISAM,
PARTITION `p0` VALUES IN (10) ENGINE = MyISAM)
select * from t1;
a b
2 5
@ -900,10 +900,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
PARTITION BY LIST (a)
(PARTITION p2 DEFAULT ENGINE = MyISAM,
PARTITION p1 VALUES IN (20,0) ENGINE = MyISAM,
PARTITION p0 VALUES IN (10) ENGINE = MyISAM)
PARTITION BY LIST (`a`)
(PARTITION `p2` DEFAULT ENGINE = MyISAM,
PARTITION `p1` VALUES IN (20,0) ENGINE = MyISAM,
PARTITION `p0` VALUES IN (10) ENGINE = MyISAM)
select * from t1;
a b
2 5
@ -927,9 +927,9 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
PARTITION BY LIST (a)
(PARTITION p1 VALUES IN (20,0) ENGINE = MyISAM,
PARTITION p0 VALUES IN (10) ENGINE = MyISAM)
PARTITION BY LIST (`a`)
(PARTITION `p1` VALUES IN (20,0) ENGINE = MyISAM,
PARTITION `p0` VALUES IN (10) ENGINE = MyISAM)
select * from t1;
a b
0 0
@ -945,10 +945,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
PARTITION BY LIST (a)
(PARTITION p1 VALUES IN (20,0) ENGINE = MyISAM,
PARTITION p0 VALUES IN (10) ENGINE = MyISAM,
PARTITION pd DEFAULT ENGINE = MyISAM)
PARTITION BY LIST (`a`)
(PARTITION `p1` VALUES IN (20,0) ENGINE = MyISAM,
PARTITION `p0` VALUES IN (10) ENGINE = MyISAM,
PARTITION `pd` DEFAULT ENGINE = MyISAM)
alter table t1 add partition (PARTITION pdd DEFAULT);
ERROR HY000: Only one DEFAULT partition allowed
alter table t1 drop partition pd;
@ -977,10 +977,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
PARTITION BY LIST COLUMNS(a,b)
(PARTITION p2 VALUES IN ((1,4),(2,5),(3,6)) ENGINE = MyISAM,
PARTITION p1 VALUES IN ((1,1),(0,0)) ENGINE = MyISAM,
PARTITION p0 DEFAULT ENGINE = MyISAM)
PARTITION BY LIST COLUMNS(`a`,`b`)
(PARTITION `p2` VALUES IN ((1,4),(2,5),(3,6)) ENGINE = MyISAM,
PARTITION `p1` VALUES IN ((1,1),(0,0)) ENGINE = MyISAM,
PARTITION `p0` DEFAULT ENGINE = MyISAM)
select * from t1;
a b
2 5
@ -1011,10 +1011,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
PARTITION BY LIST COLUMNS(a,b)
(PARTITION p2 VALUES IN ((1,4),(2,5),(3,6)) ENGINE = MyISAM,
PARTITION p1 VALUES IN ((1,1),(0,0)) ENGINE = MyISAM,
PARTITION p0 VALUES IN ((10,10)) ENGINE = MyISAM)
PARTITION BY LIST COLUMNS(`a`,`b`)
(PARTITION `p2` VALUES IN ((1,4),(2,5),(3,6)) ENGINE = MyISAM,
PARTITION `p1` VALUES IN ((1,1),(0,0)) ENGINE = MyISAM,
PARTITION `p0` VALUES IN ((10,10)) ENGINE = MyISAM)
select * from t1;
a b
2 5
@ -1045,10 +1045,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
PARTITION BY LIST COLUMNS(a,b)
(PARTITION p2 DEFAULT ENGINE = MyISAM,
PARTITION p1 VALUES IN ((1,1),(0,0)) ENGINE = MyISAM,
PARTITION p0 VALUES IN ((10,10)) ENGINE = MyISAM)
PARTITION BY LIST COLUMNS(`a`,`b`)
(PARTITION `p2` DEFAULT ENGINE = MyISAM,
PARTITION `p1` VALUES IN ((1,1),(0,0)) ENGINE = MyISAM,
PARTITION `p0` VALUES IN ((10,10)) ENGINE = MyISAM)
select * from t1;
a b
2 5
@ -1072,9 +1072,9 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
PARTITION BY LIST COLUMNS(a,b)
(PARTITION p1 VALUES IN ((1,1),(0,0)) ENGINE = MyISAM,
PARTITION p0 VALUES IN ((10,10)) ENGINE = MyISAM)
PARTITION BY LIST COLUMNS(`a`,`b`)
(PARTITION `p1` VALUES IN ((1,1),(0,0)) ENGINE = MyISAM,
PARTITION `p0` VALUES IN ((10,10)) ENGINE = MyISAM)
select * from t1;
a b
0 0
@ -1090,10 +1090,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
PARTITION BY LIST COLUMNS(a,b)
(PARTITION p1 VALUES IN ((1,1),(0,0)) ENGINE = MyISAM,
PARTITION p0 VALUES IN ((10,10)) ENGINE = MyISAM,
PARTITION pd DEFAULT ENGINE = MyISAM)
PARTITION BY LIST COLUMNS(`a`,`b`)
(PARTITION `p1` VALUES IN ((1,1),(0,0)) ENGINE = MyISAM,
PARTITION `p0` VALUES IN ((10,10)) ENGINE = MyISAM,
PARTITION `pd` DEFAULT ENGINE = MyISAM)
alter table t1 add partition (PARTITION pdd DEFAULT);
ERROR HY000: Only one DEFAULT partition allowed
alter table t1 drop partition pd;
@ -1138,10 +1138,10 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
PARTITION BY LIST COLUMNS(a,b)
(PARTITION p0 DEFAULT ENGINE = MyISAM,
PARTITION p2 VALUES IN ((1,4),(2,5),(3,6)) ENGINE = MyISAM,
PARTITION p1 VALUES IN ((1,1),(0,0)) ENGINE = MyISAM)
PARTITION BY LIST COLUMNS(`a`,`b`)
(PARTITION `p0` DEFAULT ENGINE = MyISAM,
PARTITION `p2` VALUES IN ((1,4),(2,5),(3,6)) ENGINE = MyISAM,
PARTITION `p1` VALUES IN ((1,1),(0,0)) ENGINE = MyISAM)
drop table t1;
#
# MDEV-10765: Wrong result - query does not retrieve values from
@ -1245,8 +1245,8 @@ Table Create Table
t1 CREATE TABLE `t1` (
`i` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
PARTITION BY LIST (i)
(PARTITION pdef DEFAULT ENGINE = MyISAM)
PARTITION BY LIST (`i`)
(PARTITION `pdef` DEFAULT ENGINE = MyISAM)
DROP TABLE t1;
CREATE TABLE t1 (i INT)
PARTITION BY LIST (i)
@ -1262,6 +1262,6 @@ Table Create Table
t1 CREATE TABLE `t1` (
`i` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
PARTITION BY LIST (i)
(PARTITION p VALUES IN (1,2,3,4) ENGINE = MyISAM)
PARTITION BY LIST (`i`)
(PARTITION `p` VALUES IN (1,2,3,4) ENGINE = MyISAM)
DROP TABLE t1;