diff options
| author | Mats Kindahl <mats@sun.com> | 2009-02-10 15:44:58 +0100 |
|---|---|---|
| committer | Mats Kindahl <mats@sun.com> | 2009-02-10 15:44:58 +0100 |
| commit | 9b612d2c905ab681fd8659f821caf679d692173a (patch) | |
| tree | afc07e915b6a313655e2ad77079138f37cc13e03 /mysql-test/r/commit_1innodb.result | |
| parent | 8a98664d3b825f7d98d7acd8372079fc6224dfcb (diff) | |
| download | mariadb-git-9b612d2c905ab681fd8659f821caf679d692173a.tar.gz | |
BUG#36763: TRUNCATE TABLE fails to replicate when stmt-based binlogging is not supported.
Post-merge fixes. Changes to some result sets.
mysql-test/r/commit_1innodb.result:
TRUNCATE TABLE does not cause the binary log to do commits any more.
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
TRUNCATE TABLE is not transactional, hence does not have BEGIN/COMMIT around itself.
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
TRUNCATE TABLE is not transactional, hence does not have BEGIN/COMMIT around itself.
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
TRUNCATE TABLE is not transactional, hence does not have BEGIN/COMMIT around itself.
mysql-test/suite/rpl/r/rpl_truncate_2myisam.result:
STOP SLAVE was replaced with include file.
mysql-test/suite/rpl/r/rpl_truncate_3innodb.result:
STOP SLAVE was replaced with include file.
Diffstat (limited to 'mysql-test/r/commit_1innodb.result')
| -rw-r--r-- | mysql-test/r/commit_1innodb.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/commit_1innodb.result b/mysql-test/r/commit_1innodb.result index a31a881051f..de80dba47c1 100644 --- a/mysql-test/r/commit_1innodb.result +++ b/mysql-test/r/commit_1innodb.result @@ -687,8 +687,8 @@ SUCCESS truncate table t2; call p_verify_status_increment(4, 0, 4, 0); -SUCCESS - +ERROR +Expected commit increment: 4 actual: 2 commit; # There is nothing left to commit call p_verify_status_increment(0, 0, 0, 0); @@ -854,8 +854,8 @@ SUCCESS truncate table t3; call p_verify_status_increment(4, 4, 4, 4); -SUCCESS - +ERROR +Expected commit increment: 4 actual: 2 create view v1 as select * from t2; call p_verify_status_increment(1, 0, 1, 0); SUCCESS |