database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-09 22:24:09 +03:00
Code Activity

MDEV-22164 revert "make THAN optional"

Browse Source
This commit is contained in:
Sergei Golubchik
2024-01-08 10:13:03 +01:00
parent 7ee16b1e29
commit 4089296a57
3 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/suite/parts/r/alter_table.result
View File

@@ -366,8 +366,7 @@ drop table validation;
create table t (a int primary key); create table t (a int primary key);
create table tp (a int primary key) partition by range (a) ( create table tp (a int primary key) partition by range (a) (
partition p0 values less than (100), partition p0 values less than (100),
# Cunning syntax (same as above) p1 values less than (300));
p1 values less (300));
insert into t values (1), (99); insert into t values (1), (99);
insert into tp values (2), (200); insert into tp values (2), (200);
select * from t order by a; select * from t order by a;
@@ -486,11 +485,11 @@ a
200 200
drop prepare validation; drop prepare validation;
drop prepare without_validation; drop prepare without_validation;
alter table tp convert table t to partition p2 values less (maxvalue); alter table tp convert table t to partition p2 values less than (maxvalue);
ERROR HY000: Found a row that does not match the partition ERROR HY000: Found a row that does not match the partition
alter table tp convert table t to partition p2 values less (maxvalue) with validation; alter table tp convert table t to partition p2 values less than (maxvalue) with validation;
ERROR HY000: Found a row that does not match the partition ERROR HY000: Found a row that does not match the partition
alter table tp convert table t to partition p2 values less (maxvalue) without validation; alter table tp convert table t to partition p2 values less than (maxvalue) without validation;
select * from tp partition (p0) order by a; select * from tp partition (p0) order by a;
a a
2 2

9
mysql-test/suite/parts/t/alter_table.test
View File

@@ -331,8 +331,7 @@ create table t (a int primary key);
create table tp (a int primary key) partition by range (a) ( create table tp (a int primary key) partition by range (a) (
partition p0 values less than (100), partition p0 values less than (100),
# Cunning syntax (same as above) p1 values less than (300));
p1 values less (300));
insert into t values (1), (99); insert into t values (1), (99);
insert into tp values (2), (200); insert into tp values (2), (200);
@@ -407,10 +406,10 @@ drop prepare without_validation;
# CONVERT IN # CONVERT IN
--error ER_ROW_DOES_NOT_MATCH_PARTITION --error ER_ROW_DOES_NOT_MATCH_PARTITION
alter table tp convert table t to partition p2 values less (maxvalue); alter table tp convert table t to partition p2 values less than (maxvalue);
--error ER_ROW_DOES_NOT_MATCH_PARTITION --error ER_ROW_DOES_NOT_MATCH_PARTITION
alter table tp convert table t to partition p2 values less (maxvalue) with validation; alter table tp convert table t to partition p2 values less than (maxvalue) with validation;
alter table tp convert table t to partition p2 values less (maxvalue) without validation; alter table tp convert table t to partition p2 values less than (maxvalue) without validation;
select * from tp partition (p0) order by a; select * from tp partition (p0) order by a;
select * from tp partition (p1) order by a; select * from tp partition (p1) order by a;
select * from tp partition (p2) order by a; select * from tp partition (p2) order by a;

6
sql/sql_yacc.yy
View File

@@ -4960,10 +4960,6 @@ part_name:
} }
; ;
opt_than:
/* empty */
| THAN_SYM;
opt_part_values: opt_part_values:
/* empty */ /* empty */
{ {
@@ -4981,7 +4977,7 @@ opt_part_values:
else else
part_info->part_type= HASH_PARTITION; part_info->part_type= HASH_PARTITION;
} }
| VALUES_LESS_SYM opt_than | VALUES_LESS_SYM THAN_SYM
{ {
LEX *lex= Lex; LEX *lex= Lex;
partition_info *part_info= lex->part_info; partition_info *part_info= lex->part_info;