summaryrefslogtreecommitdiff
path: root/mysql-test/include/commit.inc
diff options
context:
space:
mode:
authorunknown <mats@mats-laptop.(none)>2008-03-31 11:29:03 +0200
committerunknown <mats@mats-laptop.(none)>2008-03-31 11:29:03 +0200
commit600a664a5a220f056b61139a761093cd1aed6355 (patch)
tree44de4e11ef1938eac18ba93647ef459280997da4 /mysql-test/include/commit.inc
parente44403fe31963ef9fe8a574f0e159b9b0b67e196 (diff)
downloadmariadb-git-600a664a5a220f056b61139a761093cd1aed6355.tar.gz
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.
Diffstat (limited to 'mysql-test/include/commit.inc')
-rw-r--r--mysql-test/include/commit.inc16
1 files changed, 12 insertions, 4 deletions
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 #