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

delete.result, delete.test:

Browse Source 
A fix (bug #5733: Table handler error with self-join multi-table DELETE).
records.cc:
  A fix (bug #5733: Table handler error with self-join multi-table DELETE).


sql/records.cc:
  ]A fix (bug #5733: Table handler error with self-join multi-table DELETE).
mysql-test/t/delete.test:
  A fix (bug #5733: Table handler error with self-join multi-table DELETE).
mysql-test/r/delete.result:
  A fix (bug #5733: Table handler error with self-join multi-table DELETE).
This commit is contained in:
unknown
2004-10-01 16:23:54 +05:00
parent a8cbb00d5c
commit dc3f3ce694
3 changed files with 39 additions and 9 deletions
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(*)
0
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;
#
# 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;

13
sql/records.cc
View File

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