1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0

Browse Source 
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b5733
This commit is contained in:
ram@gw.mysql.r18.ru 2004-10-06 12:49:56 +05:00
commit 0944bed7fc
3 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/r/delete.result
View File

@ -50,3 +50,14 @@ select count(*) from t1;
count(*) count(*)
0 0
drop table t1; drop table t1;
create table t1 (a int not null auto_increment primary key, b char(32));
insert into t1 (b) values ('apple'), ('apple');
select * from t1;
a b
1 apple
2 apple
delete t1 from t1, t1 as t2 where t1.b = t2.b and t1.a > t2.a;
select * from t1;
a b
1 apple
drop table t1;

10
mysql-test/t/delete.test
View File

@ -61,3 +61,13 @@ select count(*) from t1;
drop table t1; drop table t1;
#
# Bug #5733: Table handler error with self-join multi-table DELETE
#
create table t1 (a int not null auto_increment primary key, b char(32));
insert into t1 (b) values ('apple'), ('apple');
select * from t1;
delete t1 from t1, t1 as t2 where t1.b = t2.b and t1.a > t2.a;
select * from t1;
drop table t1;

27
sql/records.cc
View File

@ -131,17 +131,26 @@ void end_read_record(READ_RECORD *info)
static int rr_quick(READ_RECORD *info) static int rr_quick(READ_RECORD *info)
{ {
int tmp=info->select->quick->get_next(); int tmp;
if (tmp) while ((tmp= info->select->quick->get_next()))
{ {
if (tmp == HA_ERR_END_OF_FILE) if (info->thd->killed)
tmp= -1;
else
{ {
if (info->print_error) my_error(ER_SERVER_SHUTDOWN, MYF(0));
info->file->print_error(tmp,MYF(0)); return 1;
if (tmp < 0) // Fix negative BDB errno }
tmp=1; if (tmp != HA_ERR_RECORD_DELETED)
{
if (tmp == HA_ERR_END_OF_FILE)
tmp= -1;
else
{
if (info->print_error)
info->file->print_error(tmp,MYF(0));
if (tmp < 0) // Fix negative BDB errno
tmp=1;
}
break;
} }
} }
return tmp; return tmp;