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

MDEV-18136 Server crashes in Item_func_dyncol_create::prepare_arguments

Browse Source 
[Closes tempesta-tech/mariadb#572]
This commit is contained in:
Aleksey Midenkov
2019-02-06 22:26:52 +03:00
committed by Alexander Barkov
parent 6473641b9a
commit c86773f46f
5 changed files with 47 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mysql-test/suite/versioning/r/partition.result
View File

@@ -522,6 +522,25 @@ set timestamp=1523466002.799571;
insert into t1 values (11),(12); insert into t1 values (11),(12);
set timestamp=1523466004.169435; set timestamp=1523466004.169435;
delete from t1 where pk in (11, 12); delete from t1 where pk in (11, 12);
#
# MDEV-18136 Server crashes in Item_func_dyncol_create::prepare_arguments
#
create or replace table t1 (pk int) with system versioning
partition by system_time interval 7 second (
partition ver_p1 history,
partition ver_pn current);
alter table t1
partition by system_time interval column_get(column_create(7,7), 7 as int) second (
partition ver_p1 history,
partition ver_pn current);
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`pk` int(11) DEFAULT NULL
) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING
PARTITION BY SYSTEM_TIME INTERVAL 7 SECOND
(PARTITION `ver_p1` HISTORY ENGINE = DEFAULT_ENGINE,
PARTITION `ver_pn` CURRENT ENGINE = DEFAULT_ENGINE)
# Test cleanup # Test cleanup
drop database test; drop database test;
create database test; create database test;

14
mysql-test/suite/versioning/t/partition.test
View File

@@ -475,6 +475,20 @@ insert into t1 values (11),(12);
set timestamp=1523466004.169435; set timestamp=1523466004.169435;
delete from t1 where pk in (11, 12); delete from t1 where pk in (11, 12);
--echo #
--echo # MDEV-18136 Server crashes in Item_func_dyncol_create::prepare_arguments
--echo #
create or replace table t1 (pk int) with system versioning
partition by system_time interval 7 second (
partition ver_p1 history,
partition ver_pn current);
alter table t1
partition by system_time interval column_get(column_create(7,7), 7 as int) second (
partition ver_p1 history,
partition ver_pn current);
--replace_result $default_engine DEFAULT_ENGINE
show create table t1;
--echo # Test cleanup --echo # Test cleanup
drop database test; drop database test;
create database test; create database test;

14
sql/partition_info.h
View File

@@ -395,16 +395,26 @@ public:
bool field_in_partition_expr(Field *field) const; bool field_in_partition_expr(Field *field) const;
bool vers_init_info(THD *thd); bool vers_init_info(THD *thd);
bool vers_set_interval(Item *item, interval_type int_type, my_time_t start) bool vers_set_interval(THD *thd, Item *item,
interval_type int_type, my_time_t start)
{ {
DBUG_ASSERT(part_type == VERSIONING_PARTITION); DBUG_ASSERT(part_type == VERSIONING_PARTITION);
vers_info->interval.type= int_type; vers_info->interval.type= int_type;
vers_info->interval.start= start; vers_info->interval.start= start;
return get_interval_value(item, int_type, &vers_info->interval.step) || if (item->fix_fields_if_needed_for_scalar(thd, &item))
return true;
bool error= get_interval_value(item, int_type, &vers_info->interval.step) ||
vers_info->interval.step.neg || vers_info->interval.step.second_part || vers_info->interval.step.neg || vers_info->interval.step.second_part ||
!(vers_info->interval.step.year || vers_info->interval.step.month || !(vers_info->interval.step.year || vers_info->interval.step.month ||
vers_info->interval.step.day || vers_info->interval.step.hour || vers_info->interval.step.day || vers_info->interval.step.hour ||
vers_info->interval.step.minute || vers_info->interval.step.second); vers_info->interval.step.minute || vers_info->interval.step.second);
if (error)
{
my_error(ER_PART_WRONG_VALUE, MYF(0),
thd->lex->create_last_non_select_table->table_name.str,
"INTERVAL");
}
return error;
} }
bool vers_set_limit(ulonglong limit) bool vers_set_limit(ulonglong limit)
{ {

7
sql/sql_yacc.yy
View File

@@ -6064,13 +6064,8 @@ opt_versioning_rotation:
| INTERVAL_SYM expr interval opt_versioning_interval_start | INTERVAL_SYM expr interval opt_versioning_interval_start
{ {
partition_info *part_info= Lex->part_info; partition_info *part_info= Lex->part_info;
if (unlikely(part_info->vers_set_interval($2, $3, $4))) if (unlikely(part_info->vers_set_interval(thd, $2, $3, $4)))
{
my_error(ER_PART_WRONG_VALUE, MYF(0),
Lex->create_last_non_select_table->table_name.str,
"INTERVAL");
MYSQL_YYABORT; MYSQL_YYABORT;
}
} }
| LIMIT ulonglong_num | LIMIT ulonglong_num
{ {

7
sql/sql_yacc_ora.yy
View File

@@ -5910,13 +5910,8 @@ opt_versioning_rotation:
| INTERVAL_SYM expr interval opt_versioning_interval_start | INTERVAL_SYM expr interval opt_versioning_interval_start
{ {
partition_info *part_info= Lex->part_info; partition_info *part_info= Lex->part_info;
if (unlikely(part_info->vers_set_interval($2, $3, $4))) if (unlikely(part_info->vers_set_interval(thd, $2, $3, $4)))
{
my_error(ER_PART_WRONG_VALUE, MYF(0),
Lex->create_last_non_select_table->table_name.str,
"INTERVAL");
MYSQL_YYABORT; MYSQL_YYABORT;
}
} }
| LIMIT ulonglong_num | LIMIT ulonglong_num
{ {