mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 10:14:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

BUG#6883: Merge fixes

Browse source 
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
This commit is contained in:
unknown 2005-06-07 16:43:43 +02:00
parent 5c05594a24
commit 887172a466
4 changed files with 282 additions and 173 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mysql-test/r/innodb.result
View file

@ -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

436
mysql-test/r/rpl_ddl.result
View file

File diff suppressed because it is too large Load diff

4
mysql-test/r/sp_trans.result
View file

@ -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|

6
mysql-test/t/sp_trans.test
View file

@ -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|