database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

post merge fixes

Browse Source
This commit is contained in:
Sinisa@sinisa.nasamreza.org
2005-03-08 22:59:21 +02:00
parent d6b9e709bf f066f4db83
commit b2c77c1c9c
5 changed files with 56 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.bzrignore
View File

@ -1105,3 +1105,4 @@ vio/test-ssl
vio/test-sslclient vio/test-sslclient
vio/test-sslserver vio/test-sslserver
vio/viotest-ssl vio/viotest-ssl
acinclude.m4

24
mysql-test/r/sp.result
View File

@ -2697,6 +2697,30 @@ call bug7992()|
call bug7992()| call bug7992()|
drop procedure bug7992| drop procedure bug7992|
drop table t3| drop table t3|
drop table t2;
drop table t1;
drop procedure if exists sp1;
create table t1 (a int) engine=innodb|
create procedure sp1 ()
begin
truncate table t1; insert t1 values (1); rollback;
end
|
set autocommit=0;
insert t1 values (2);
call sp1();
ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
commit;
set autocommit=1;
select * from t1;
a
2
call sp1();
select * from t1;
a
1
drop table t1;
drop procedure sp1;
create table t3 ( create table t3 (
lpitnumber int(11) default null, lpitnumber int(11) default null,
lrecordtype int(11) default null lrecordtype int(11) default null

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

@ -3276,7 +3276,35 @@ call bug7992()|
call bug7992()| call bug7992()|
drop procedure bug7992| drop procedure bug7992|
drop table t3| drop table t3|
delimiter ;|
drop table t2;
drop table t1;
#
# BUG#8850
#
--disable_warnings
drop procedure if exists sp1;
--enable_warnings
delimiter |;
create table t1 (a int) engine=innodb|
create procedure sp1 ()
begin
truncate table t1; insert t1 values (1); rollback;
end
|
delimiter ;|
set autocommit=0;
insert t1 values (2);
--error 1192
call sp1();
commit;
set autocommit=1;
select * from t1;
call sp1();
select * from t1;
drop table t1;
drop procedure sp1;
# #
# BUG#8849: problem with insert statement with table alias's # BUG#8849: problem with insert statement with table alias's

3
sql/sql_delete.cc
View File

@ -749,11 +749,12 @@ bool mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok)
table_list->db, table_list->table_name); table_list->db, table_list->table_name);
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
} }
if (!ha_supports_generate(table_type)) if (!ha_supports_generate(table_type) || thd->lex->sphead)
{ {
/* Probably InnoDB table */ /* Probably InnoDB table */
table_list->lock_type= TL_WRITE; table_list->lock_type= TL_WRITE;
ha_enable_transaction(thd, FALSE); ha_enable_transaction(thd, FALSE);
mysql_init_select(thd->lex);
error= mysql_delete(thd, table_list, (COND*) 0, (SQL_LIST*) 0, error= mysql_delete(thd, table_list, (COND*) 0, (SQL_LIST*) 0,
HA_POS_ERROR, 0); HA_POS_ERROR, 0);
ha_enable_transaction(thd, TRUE); ha_enable_transaction(thd, TRUE);

2
sql/sql_parse.cc
View File

@ -3191,7 +3191,7 @@ unsent_create_error:
Don't allow this within a transaction because we want to use Don't allow this within a transaction because we want to use
re-generate table re-generate table
*/ */
if (thd->locked_tables || thd->active_transaction()) if ((thd->locked_tables && !lex->sphead) || thd->active_transaction())
{ {
my_message(ER_LOCK_OR_ACTIVE_TRANSACTION, my_message(ER_LOCK_OR_ACTIVE_TRANSACTION,
ER(ER_LOCK_OR_ACTIVE_TRANSACTION), MYF(0)); ER(ER_LOCK_OR_ACTIVE_TRANSACTION), MYF(0));