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

MDEV-16903 Assertion `!auto_increment_field_not_null' failed in TABLE::init after unsuccessful attempt to add CHECK constraint on temporary table

Browse Source 
if the CHECK constraint failed in copy_data_between_tables(),
the loop was aborted prematurely and to->auto_increment_field_not_null
wasn't reset.
This commit is contained in:
Sergei Golubchik
2018-12-14 14:28:30 +01:00
parent a79183b01e
commit 7b2e2288e9
4 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/r/check.result
View File

@@ -85,3 +85,13 @@ t1 CREATE TABLE `t1` (
`c` int(11) DEFAULT NULL `c` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1; DROP TABLE t1;
create temporary table t1 (
id int not null auto_increment primary key,
f int not null default 0
);
insert into t1 () values ();
alter ignore table t1 add constraint check (f > 0);
Warnings:
Warning 4025 CONSTRAINT `CONSTRAINT_1` failed for `test`.`t1`
alter table t1;
drop table t1;

12
mysql-test/t/check.test
View File

@@ -103,3 +103,15 @@ CREATE OR REPLACE TABLE t1 (a INT, b INT, c INT, CHECK (a+b>0)) ENGINE=MyISAM;
ALTER TABLE t1 DROP COLUMN b, DROP CONSTRAINT `CONSTRAINT_1`; ALTER TABLE t1 DROP COLUMN b, DROP CONSTRAINT `CONSTRAINT_1`;
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
DROP TABLE t1; DROP TABLE t1;
#
# MDEV-16903 Assertion `!auto_increment_field_not_null' failed in TABLE::init after unsuccessful attempt to add CHECK constraint on temporary table
#
create temporary table t1 (
id int not null auto_increment primary key,
f int not null default 0
);
insert into t1 () values ();
alter ignore table t1 add constraint check (f > 0);
alter table t1;
drop table t1;

16
sql/sql_table.cc
View File

@@ -10065,14 +10065,7 @@ copy_data_between_tables(THD *thd, TABLE *from, TABLE *to,
error= 1; error= 1;
break; break;
} }
if (to->next_number_field)
{
if (auto_increment_field_copied)
to->auto_increment_field_not_null= TRUE;
else
to->next_number_field->reset();
}
for (Copy_field *copy_ptr=copy ; copy_ptr != copy_end ; copy_ptr++) for (Copy_field *copy_ptr=copy ; copy_ptr != copy_end ; copy_ptr++)
{ {
copy_ptr->do_copy(copy_ptr); copy_ptr->do_copy(copy_ptr);
@@ -10091,6 +10084,13 @@ copy_data_between_tables(THD *thd, TABLE *from, TABLE *to,
error= 1; error= 1;
break; break;
} }
if (to->next_number_field)
{
if (auto_increment_field_copied)
to->auto_increment_field_not_null= TRUE;
else
to->next_number_field->reset();
}
error=to->file->ha_write_row(to->record[0]); error=to->file->ha_write_row(to->record[0]);
to->auto_increment_field_not_null= FALSE; to->auto_increment_field_not_null= FALSE;
if (error) if (error)

11
sql/temporary_tables.cc
View File

@@ -1140,8 +1140,7 @@ TABLE *THD::open_temporary_table(TMP_TABLE_SHARE *share,
@return Success false @return Success false
Failure true Failure true
*/ */
bool THD::find_and_use_tmp_table(const TABLE_LIST *tl, bool THD::find_and_use_tmp_table(const TABLE_LIST *tl, TABLE **out_table)
TABLE **out_table)
{ {
DBUG_ENTER("THD::find_and_use_tmp_table"); DBUG_ENTER("THD::find_and_use_tmp_table");
@@ -1151,11 +1150,9 @@ bool THD::find_and_use_tmp_table(const TABLE_LIST *tl,
key_length= create_tmp_table_def_key(key, tl->get_db_name(), key_length= create_tmp_table_def_key(key, tl->get_db_name(),
tl->get_table_name()); tl->get_table_name());
result= result= use_temporary_table(find_temporary_table(key, key_length,
use_temporary_table(find_temporary_table(key, key_length, TMP_TABLE_NOT_IN_USE),
TMP_TABLE_NOT_IN_USE), out_table);
out_table);
DBUG_RETURN(result); DBUG_RETURN(result);
} }