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

sp.test:

Browse Source 
test case for the fix for bug #2614
sp_head.cc:
  A fix for a crashing bug in stored procedures with INSERT ... SELECT ... (Bug #2514)


sql/sp_head.cc:
  A fix for a crashing bug in stored procedures with INSERT ... SELECT ... (Bug #2514)
mysql-test/t/sp.test:
  test case for the fix for bug #2614
This commit is contained in:
unknown
2004-02-03 16:22:43 +02:00
parent b0bde7ab0e
commit 323bca3380
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mysql-test/t/sp.test
View File

@@ -1299,7 +1299,20 @@ show create procedure bar|
--replace_column 4 '0000-00-00 00:00:00' 5 '0000-00-00 00:00:00' --replace_column 4 '0000-00-00 00:00:00' 5 '0000-00-00 00:00:00'
show procedure status like 'bar'| show procedure status like 'bar'|
drop procedure bar| drop procedure bar|
delimiter ;| delimiter ;|
drop table t1; drop table t1;
drop table t2; drop table t2;
delimiter |
drop procedure if exists crash|
create procedure crash()
begin
drop table if exists t1;
create table t1 (id int default '0' not null);
insert into t1 select 12;
insert into t1 select * from t1;
end|
delimiter ;
call crash();
call crash();
drop table t1;
drop procedure if exists crash;

10
sql/sp_head.cc
View File

@@ -852,6 +852,11 @@ sp_instr_stmt::exec_stmt(THD *thd, LEX *lex)
{ {
TABLE_LIST *tabs; TABLE_LIST *tabs;
if (lex->sql_command == SQLCOM_CREATE_TABLE ||
lex->sql_command == SQLCOM_INSERT_SELECT)
{ // Restore sl->table_list.first
sl->table_list.first= sl->table_list_first_copy;
}
// We have closed all tables, get rid of pointers to them // We have closed all tables, get rid of pointers to them
for (tabs=(TABLE_LIST *)sl->table_list.first ; for (tabs=(TABLE_LIST *)sl->table_list.first ;
tabs ; tabs ;
@@ -859,11 +864,6 @@ sp_instr_stmt::exec_stmt(THD *thd, LEX *lex)
{ {
tabs->table= NULL; tabs->table= NULL;
} }
if (lex->sql_command == SQLCOM_CREATE_TABLE ||
lex->sql_command == SQLCOM_INSERT_SELECT)
{ // Restore sl->table_list.first
sl->table_list.first= sl->table_list_first_copy;
}
for (ORDER *order= (ORDER *)sl->order_list.first ; for (ORDER *order= (ORDER *)sl->order_list.first ;
order ; order ;
order= order->next) order= order->next)