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

Fix crash in 'INSERT DELAYED' statement that failed due to a

Browse Source 
conflict in a unique key. (Bug #12226)
This commit is contained in:
jimw@mysql.com
2005-08-01 17:00:03 -07:00
parent ea7df08c93
commit 4cf8696eae
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/r/delayed.result
View File

@ -32,3 +32,10 @@ a b
3 d 3 d
4 e 4 e
drop table t1; drop table t1;
create table t1 (a int not null primary key);
insert into t1 values (1);
insert delayed into t1 values (1);
select * from t1;
a
1
drop table t1;

9
mysql-test/t/delayed.test
View File

@ -38,3 +38,12 @@ select * from t1;
drop table t1; drop table t1;
# End of 4.1 tests # End of 4.1 tests
#
# Bug #12226: Crash when a delayed insert fails due to a duplicate key
#
create table t1 (a int not null primary key);
insert into t1 values (1);
insert delayed into t1 values (1);
select * from t1;
drop table t1;

4
sql/sql_insert.cc
View File

@ -1088,7 +1088,9 @@ ok_or_after_trg_err:
err: err:
info->last_errno= error; info->last_errno= error;
thd->lex->current_select->no_error= 0; // Give error /* current_select is NULL if this is a delayed insert */
if (thd->lex->current_select)
thd->lex->current_select->no_error= 0; // Give error
table->file->print_error(error,MYF(0)); table->file->print_error(error,MYF(0));
before_trg_err: before_trg_err: