From 3155a88d6cffc2222c711dc7136db085c3e64faa Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 12 Mar 2008 16:52:29 +0300 Subject: Fixed test failures caused by insufficient cleanups in the tests for bug12713. --- mysql-test/include/commit.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mysql-test/include/commit.inc') diff --git a/mysql-test/include/commit.inc b/mysql-test/include/commit.inc index 9bd11bf33c1..0d2e3425141 100644 --- a/mysql-test/include/commit.inc +++ b/mysql-test/include/commit.inc @@ -732,6 +732,6 @@ call p_verify_status_increment(0, 0, 0, 0); --echo # --echo # Cleanup --echo # -drop table t1; +drop table t1, t2, t3; drop procedure p_verify_status_increment; drop function f1; -- cgit v1.2.1 From 600a664a5a220f056b61139a761093cd1aed6355 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 31 Mar 2008 11:29:03 +0200 Subject: Updating commit.inc since the number of commits done for non-transactional tables is not zero any more. For row-based logging, there is an extra commit for sending rows changed by the statement to the binary log. mysql-test/include/commit.inc: For row-based logging, an extra commit is done for each statement to commit non-transactional changes to the binary log. mysql-test/r/commit_1innodb.result: Result change. --- mysql-test/include/commit.inc | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'mysql-test/include/commit.inc') diff --git a/mysql-test/include/commit.inc b/mysql-test/include/commit.inc index 5c1baa562c5..98f9c93b25a 100644 --- a/mysql-test/include/commit.inc +++ b/mysql-test/include/commit.inc @@ -542,17 +542,25 @@ call p_verify_status_increment(0, 0, 0, 0); --echo # 16. A function changes non-trans-table. --echo # +--echo # For row-based logging, there is an extra commit for the +--echo # non-transactional changes saved in the transaction cache to +--echo # the binary log. +--echo # select f1(); -call p_verify_status_increment(0, 0, 0, 0); +call p_verify_status_increment(0, 0, 1, 0); commit; -call p_verify_status_increment(0, 0, 0, 0); +call p_verify_status_increment(0, 0, 1, 0); --echo # 17. Read-only statement, a function changes non-trans-table. --echo # +--echo # For row-based logging, there is an extra commit for the +--echo # non-transactional changes saved in the transaction cache to +--echo # the binary log. +--echo # select f1() from t1; -call p_verify_status_increment(1, 0, 1, 0); +call p_verify_status_increment(1, 0, 2, 0); commit; -call p_verify_status_increment(1, 0, 1, 0); +call p_verify_status_increment(1, 0, 2, 0); --echo # 18. Read-write statement: UPDATE, change 0 (transactional) rows. --echo # -- cgit v1.2.1