Commit c33f7f9f authored by unknown's avatar unknown
Browse files

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

conflict in a unique key. (Bug #12226)


mysql-test/r/delayed.result:
  Add results
mysql-test/t/delayed.test:
  Add new regression test
sql/sql_insert.cc:
  Fix crash in error handling of 'INSERT DELAYED' statement
parent e53419b4

mysql-test/r/delayed.result

+7 −0
Original line number Diff line number Diff line
@@ -32,3 +32,10 @@ a b 
3	d

4	e

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;

mysql-test/t/delayed.test

+9 −0
Original line number Diff line number Diff line
@@ -38,3 +38,12 @@ select * from t1; 
drop table t1;



# 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;

sql/sql_insert.cc

+3 −1
Original line number Diff line number Diff line
@@ -1088,6 +1088,8 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info) 


err:

  info->last_errno= 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));