Commit 887172a4 authored by unknown's avatar unknown
Browse files

BUG#6883: Merge fixes 


mysql-test/r/innodb.result:
  Minor fixes
mysql-test/r/rpl_ddl.result:
  Merge fixes
mysql-test/r/sp_trans.result:
  TRUNCATE now makes implicit commit
mysql-test/t/sp_trans.test:
  No error since we have inplicit commit
parent 5c05594a

mysql-test/r/innodb.result

+3 −6
Original line number Diff line number Diff line
@@ -1637,16 +1637,14 @@ t2 CREATE TABLE `t2` ( 
drop table t2, t1;

show status like "binlog_cache_use";

Variable_name	Value

Binlog_cache_use	24

Binlog_cache_use	25

Binlog_cache_use	155

show status like "binlog_cache_disk_use";

Variable_name	Value

Binlog_cache_disk_use	0

create table t1 (a int) engine=innodb;

show status like "binlog_cache_use";

Variable_name	Value

Binlog_cache_use	25

Binlog_cache_use	26

Binlog_cache_use	156

show status like "binlog_cache_disk_use";

Variable_name	Value

Binlog_cache_disk_use	1
@@ -1655,8 +1653,7 @@ delete from t1; 
commit;

show status like "binlog_cache_use";

Variable_name	Value

Binlog_cache_use	26

Binlog_cache_use	27

Binlog_cache_use	157

show status like "binlog_cache_disk_use";

Variable_name	Value

Binlog_cache_disk_use	1

mysql-test/r/rpl_ddl.result

+278 −158

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/r/sp_trans.result

+0 −4
Original line number Diff line number Diff line
@@ -7,16 +7,12 @@ end| 
set autocommit=0|

insert t1 values (2)|

call bug8850()|

ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction

commit|

select * from t1|

a

2

call bug8850()|

ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction

set autocommit=1|

select * from t1|

a

2

drop table t1|

drop procedure bug8850|

mysql-test/t/sp_trans.test

+1 −5
Original line number Diff line number Diff line
@@ -20,14 +20,10 @@ end| 


set autocommit=0|

insert t1 values (2)|

--error 1192

call bug8850()|

commit|

select * from t1|

#

# when CALL will be fixed to not start a transaction, the error should

# go away

--error 1192



call bug8850()|

set autocommit=1|

select * from t1|